merge 64-bit fixes from Fernando Lucas Rodriguez <fernando_lr@terra.es>

[debian/gcpegg] / global.h

diff --git a/global.h b/global.h
index 09d20052ff5ab97fc6529d36f3ee1c5a911c7e91..d771cef75da6331fb73cca1781d8fac502e2c83b 100644 (file)
--- a/global.h
+++ b/global.h
@@ -32,24 +32,35 @@
 #include "byteorder.h"         /* Build byte-order independent version */
 
 /* Good for i386, but be careful... */
+/*
 #ifdef linux
 #include <sys/types.h>
-typedef __u8  byte;
-typedef __u8  uint8;
-typedef __u16 uint16;
-typedef __u32 uint32;
-typedef __s8  int8;
-typedef __s16 int16;
-typedef __s32 int32;
+ typedef __u8  byte;
+ typedef __u8  uint8;
+ typedef __u16 uint16;
+ typedef __u32 uint32;
+ typedef __s8  int8;
+ typedef __s16 int16;
+ typedef __s32 int32;
 #else
-typedef unsigned char byte;
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned long uint32;
-typedef char int8;
-typedef short int16;
-typedef long int32;
-#endif /* linux */
+ typedef unsigned char byte;
+ typedef unsigned char uint8;
+ typedef unsigned ushort uint16;
+ typedef unsigned uint uint32;
+ typedef char int8;
+ typedef short int16;
+ typedef int int32;
+#endif
+*/
+
+#include <stdint.h>
+typedef uint8_t byte;
+typedef uint8_t        uint8;
+typedef uint16_t uint16;
+typedef uint32_t uint32;
+typedef int8_t int8;
+typedef int16_t int16;
+typedef int32_t int32;
 
 /* Some fixed assumptions:
    Trial type is always bitsum.
@@ -168,7 +179,7 @@ typedef struct eggentry {
   char *primbasket;
   int16 conntype;
   int16 connival;      /* Connect interval in minutes */
-  int32 lastupd;       /* Zulutime of last update received */
+  uint32 lastupd;      /* Zulutime of last update received */
   int16 setup;         /* Does setup match config file? */
   char *upcmd;         /* Command to bring net up (req if conntype == DND) */
   char *dncmd;         /* Command to bring net down */