Make abcess.h and ick_ec.h and stdint.h play nicely with each other

diff --git a/src/abcess.h b/src/abcess.h
index 2d72cb164a0f22b9415db27f338ad2b3944d6095..65677cacbdbe7ac24f34f251d48d347763cadce3 100644 (file)
--- a/src/abcess.h
+++ b/src/abcess.h
@@ -17,6 +17,8 @@ typedef int ick_bool;
 #define ICKBOOL_DEFINED
 #endif
 
+#define ICK_ABCESS_H_INCLUDED
+
 #define ick_TRUE       1
 #define ick_FALSE      0
 

diff --git a/src/ick_ec.h b/src/ick_ec.h
index 0246090c117738756023333ca225264b2940cab2..e8476daf283872fb7dccb24bb662a64ecc6efb2b 100644 (file)
--- a/src/ick_ec.h
+++ b/src/ick_ec.h
@@ -49,10 +49,15 @@ LICENSE TERMS
 #if ICK_HAVE_STDINT_H+1 == 2
 #include <stdint.h>
 #else
-typedef unsigned long uint32_t;
+typedef unsigned int   uint32_t;
 typedef unsigned short uint16_t;
 #endif
 
+#ifndef ICK_ABCESS_H_INCLUDED
+typedef unsigned short ick_type16;
+typedef unsigned int   ick_type32;
+#endif
+
 #define ICK_EC_FUNC_START(id)                    \
 ICK_EC_PP_0(id)                                  \
 void id(void)                                    \

diff --git a/src/perpet.c b/src/perpet.c
index 06dade1301e3707a0c01ded2ab41478baf05346e..cef5b84996ba24ae4ced238ce3b968d68bf20459 100644 (file)
--- a/src/perpet.c
+++ b/src/perpet.c
@@ -1625,14 +1625,12 @@ int main(int argc, char *argv[])
 #else
                    (void) sprintf(buf2,
 #endif
-#define XSTR(x) #x
-#define IHSH XSTR(ICK_HAVE_STDINT_H)
 "%s -L%s -L%s -L%s/../lib -O2 -o %s" EXEEXT "%s "
 #ifndef __DJGPP__
 "-Wl,-z,muldefs "
 #endif
-"-DICK_HAVE_STDINT_H=%s -x c --std=c%d %s", compiler, libdir,
-path, path, argv[oldoptind], cdebug?" -g":"", IHSH,
+"-DICK_HAVE_STDINT_H=%d -lm -x c --std=c%d %s", compiler, libdir,
+path, path, argv[oldoptind], cdebug?" -g":"", ICK_HAVE_STDINT_H+1==2?1:0,
 needc99?99:89,tempfn);
 #if 0
       ); /* for Emacs' autoindenter */