shishi/asn1 defines.h mem.h

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/11/26 09:00:40

Modified files:
        asn1           : defines.h mem.h 

Log message:
        Upstream sync.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/asn1/defines.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/asn1/mem.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: shishi/asn1/defines.h
diff -u shishi/asn1/defines.h:1.1 shishi/asn1/defines.h:1.2
--- shishi/asn1/defines.h:1.1   Wed Aug  6 22:11:49 2003
+++ shishi/asn1/defines.h       Wed Nov 26 09:00:39 2003
@@ -23,21 +23,6 @@
 
 #include <config.h>
 
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
-#pragma alloca
-#  else
-#   ifndef alloca      /* predefined by HP cc +Olibcalls */
-char *alloca();
-#   endif
-#  endif
-# endif
-#endif
-
-
 #ifdef STDC_HEADERS
 # include <string.h>
 # include <stdlib.h>
Index: shishi/asn1/mem.h
diff -u shishi/asn1/mem.h:1.1 shishi/asn1/mem.h:1.2
--- shishi/asn1/mem.h:1.1       Wed Aug  6 22:11:49 2003
+++ shishi/asn1/mem.h   Wed Nov 26 09:00:39 2003
@@ -6,6 +6,9 @@
  * support alloca.
  */
 #ifdef HAVE_ALLOCA
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# endif
 # define _asn1_alloca alloca
 # define _asn1_afree(x)
 #else