Changed part of unsigned long type to uint32_t

goldlib/gall/gdefs.h

@@ -143,6 +143,10 @@ typedef unsigned int uint;
 
 typedef uint32_t  time32_t;   /* 32-bit time_t type */
 
+//  ------------------------------------------------------------------
+
+#ifdef __cplusplus
+
 //  ------------------------------------------------------------------
 //  Common function-pointer types
 
@@ -205,6 +209,9 @@ template <class T> inline bool make_bool(T a)            { return a ? true : fal
 #define MinV minimum_of_two
 #define MaxV maximum_of_two
 
+//  ------------------------------------------------------------------
+
+#endif  //#ifdef __cplusplus
 
 //  ------------------------------------------------------------------
 

goldlib/gall/gdirposx.h

@@ -57,7 +57,7 @@ private:
 	std::string dirname;
 	gdirentry ret;
 	gstrarray entries;
-	unsigned long last_entry;
+	uint32_t last_entry;
 
 public:
 	bool ok;

goldlib/gall/gfile.cpp

@@ -392,17 +392,17 @@ int gfile::setvbuf(char* __buf, int __type, size_t __size) {
 #ifdef __GOLDWARE_HAS_BOOL
 gfile& gfile::operator>> (bool& i)             { fread(&i, sizeof(bool)); return *this; }
 #endif
-gfile& gfile::operator>> (unsigned char& i)    { fread(&i, sizeof(unsigned char)); return *this; }
+gfile& gfile::operator>> (uint8_t& i)          { fread(&i, sizeof(uint8_t)); return *this; }
-gfile& gfile::operator>> (unsigned short& i)   { fread(&i, sizeof(unsigned short)); return *this; }
+gfile& gfile::operator>> (uint16_t& i)         { fread(&i, sizeof(uint16_t)); return *this; }
-gfile& gfile::operator>> (unsigned int& i)     { unsigned int ii; fread(&ii, sizeof(unsigned int)); i = ii; return *this; }
+gfile& gfile::operator>> (uint32_t& i)         { fread(&i, sizeof(uint32_t)); return *this; }
 gfile& gfile::operator>> (unsigned long& i)    { fread(&i, sizeof(unsigned long)); return *this; }
 
 #ifdef __GOLDWARE_HAS_BOOL
 gfile& gfile::operator<< (bool o)             { fwrite(&o, sizeof(o)); return *this; }
 #endif
-gfile& gfile::operator<< (unsigned char o)    { fwrite(&o, sizeof(o)); return *this; }
+gfile& gfile::operator<< (uint8_t o)          { fwrite(&o, sizeof(o)); return *this; }
-gfile& gfile::operator<< (unsigned short o)   { fwrite(&o, sizeof(o)); return *this; }
+gfile& gfile::operator<< (uint16_t o)         { fwrite(&o, sizeof(o)); return *this; }
-gfile& gfile::operator<< (unsigned int o)     { fwrite(&o, sizeof(o)); return *this; }
+gfile& gfile::operator<< (uint32_t o)         { fwrite(&o, sizeof(o)); return *this; }
 gfile& gfile::operator<< (unsigned long o)    { fwrite(&o, sizeof(o)); return *this; }
 
 

goldlib/gall/gfile.h

@@ -153,28 +153,28 @@ public:
   #ifdef __GOLDWARE_HAS_BOOL
   gfile& operator>> (bool& i);
   #endif
-  gfile& operator>> (unsigned char& i);
+  gfile& operator>> (uint8_t& i);
-  gfile& operator>> (unsigned short& i);
+  gfile& operator>> (uint16_t& i);
-  gfile& operator>> (unsigned int& i);
+  gfile& operator>> (uint32_t& i);
   gfile& operator>> (unsigned long& i);
-  gfile& operator>> (char& i)        { return operator>>((unsigned char&)i); }
+  gfile& operator>> (char& i)     { return operator>>((uint8_t&)i); }
-  gfile& operator>> (signed char& i) { return operator>>((unsigned char&)i); }
+  gfile& operator>> (int8_t& i)   { return operator>>((uint8_t&)i); }
-  gfile& operator>> (short& i)       { return operator>>((unsigned short&)i); }
+  gfile& operator>> (int16_t& i)  { return operator>>((uint16_t&)i); }
-  gfile& operator>> (int& i)         { return operator>>((unsigned int&)i); }
+  gfile& operator>> (int32_t& i)  { return operator>>((uint32_t&)i); }
-  gfile& operator>> (long& i)        { return operator>>((unsigned long&)i); }
+  gfile& operator>> (long& i)     { return operator>>((unsigned long&)i); }
 
   #ifdef __GOLDWARE_HAS_BOOL
   gfile& operator<< (bool o);
   #endif
-  gfile& operator<< (unsigned char o);
+  gfile& operator<< (uint8_t o);
-  gfile& operator<< (unsigned short o);
+  gfile& operator<< (uint16_t o);
-  gfile& operator<< (unsigned int o);
+  gfile& operator<< (uint32_t o);
   gfile& operator<< (unsigned long o);
-  gfile& operator<< (char o)        { return operator<<((unsigned char)o); }
+  gfile& operator<< (char o)      { return operator<<((uint8_t )o); }
-  gfile& operator<< (signed char o) { return operator<<((unsigned char)o); }
+  gfile& operator<< (int8_t  o)   { return operator<<((uint8_t )o); }
-  gfile& operator<< (short o)       { return operator<<((unsigned short)o); }
+  gfile& operator<< (int16_t  o)  { return operator<<((uint16_t)o); }
-  gfile& operator<< (int o)         { return operator<<((unsigned int)o); }
+  gfile& operator<< (int32_t o)   { return operator<<((uint32_t)o); }
-  gfile& operator<< (long o)        { return operator<<((unsigned long)o); }
+  gfile& operator<< (long o)      { return operator<<((unsigned long)o); }
 
 };
 

goldlib/gall/gvidall.h

@@ -256,9 +256,9 @@ struct GVidInfo {
 //  ------------------------------------------------------------------
 
 #ifdef __DJGPP__
-typedef unsigned long gdma; // Video DMA linear address
+typedef uint32_t gdma; // Video DMA linear address
 #else
-typedef word*         gdma; // Video DMA pointer
+typedef word*    gdma; // Video DMA pointer
 #endif
 
 //  ------------------------------------------------------------------

goldlib/gall/gvidbase.cpp

@@ -80,7 +80,7 @@
 
 static bool __vcurhidden = false;
 #if defined(__UNIX__) || defined(__USE_NCURSES__)
-static unsigned long gvid_boxcvtc(char);
+static uint32_t gvid_boxcvtc(char);
 #endif
 
 #if !defined(__USE_NCURSES__)
@@ -2094,7 +2094,7 @@ void gvid_boxcvt(char* s) {
     *s++ = (char)gvid_boxcvtc(*s);
 }
 
-static unsigned long gvid_boxcvtc(char c) {
+static uint32_t gvid_boxcvtc(char c) {
     switch(c) {
 #if 0
       case 'Ú': return _box_table(8, 0);

goldlib/gcfg/gs_fm092.h

@@ -134,8 +134,8 @@ typedef struct {
   char            versionMajor;
   char            versionMinor;
   long            creationDate;
-  unsigned long   key;
+  uint32_t        key;
-  unsigned long   reservedKey;
+  uint32_t        reservedKey;
   char            sysopNameOld[32];
   akaListType     akaList;
   nodeFakeType    reservedAka[16-MAX_AKAS];

goldlib/gcfg/gs_im175.h

@@ -152,22 +152,22 @@ struct dom {
 };
 
 struct im_stats {
-  unsigned long  th_day_nr;                   /* nr this day */
+  uint32_t  th_day_nr;      /* nr this day */
-  unsigned long  la_day_nr;                   /* nr last day */
+  uint32_t  la_day_nr;      /* nr last day */
-  unsigned long  th_week_nr;                  /* nr this week */
+  uint32_t  th_week_nr;     /* nr this week */
-  unsigned long  la_week_nr;                  /* nr last week */
+  uint32_t  la_week_nr;     /* nr last week */
-  unsigned long  th_month_nr;                 /* nr this month */
+  uint32_t  th_month_nr;    /* nr this month */
-  unsigned long  la_month_nr;                 /* nr last month */
+  uint32_t  la_month_nr;    /* nr last month */
-  unsigned long  th_year_nr;                  /* nr this year */
+  uint32_t  th_year_nr;     /* nr this year */
-  unsigned long  la_year_nr;                  /* nr last year */
+  uint32_t  la_year_nr;     /* nr last year */
-  unsigned long  th_day_size;                 /* amount this day */
+  uint32_t  th_day_size;    /* amount this day */
-  unsigned long  la_day_size;                 /* amount last day */
+  uint32_t  la_day_size;    /* amount last day */
-  unsigned long  th_week_size;                /* amount this week */
+  uint32_t  th_week_size;   /* amount this week */
-  unsigned long  la_week_size;                /* amount last week */
+  uint32_t  la_week_size;   /* amount last week */
-  unsigned long  th_month_size;               /* amount this month */
+  uint32_t  th_month_size;  /* amount this month */
-  unsigned long  la_month_size;               /* amount last month */
+  uint32_t  la_month_size;  /* amount last month */
-  unsigned long  th_year_size;                /* amount this year */
+  uint32_t  th_year_size;   /* amount this year */
-  unsigned long  la_year_size;                /* amount last year */
+  uint32_t  la_year_size;   /* amount last year */
 };
 
 
@@ -247,7 +247,7 @@ struct im_config_type {
   byte           unlink_req;                    /* Unlink areas without dlink */
   byte           keep_alnk_req;                 /* keep arealink request */
   byte           rsvd7;                         /* reserved */
-  unsigned long  max_dupes;                     /* max dupes kept in dbase */
+  uint32_t       max_dupes;                     /* max dupes kept in dbase */
   word           max_files_per_dir;             /* max. nr files when autocreate */
   byte           deadlink_days;                 /* nr of days for a dealink req */
   byte           rsvd8;                         /* reserved */
@@ -266,8 +266,8 @@ struct im_config_type {
   char           echojam[MAXPATH];              /* path to ECHOMAIL.JAM */
   char           before_toss_ii[MAXPATH];       /* call before proc. the PKTs */
   char           userbase[MAXPATH];             /* path to the userbase */
-  unsigned long  stoptossmsgs;                  /* stop tossing after xxxxx msgs */
+  uint32_t       stoptossmsgs;                  /* stop tossing after xxxxx msgs */
-  unsigned long  stoptossnetmsgs;               /* stop tossing after xxxxx net */
+  uint32_t       stoptossnetmsgs;               /* stop tossing after xxxxx net */
                                                 /* msgs within a PKT or at all */
   char           ignorelist[MAXPATH];           /* list of areas to suppress */
   char           db_queue[MAXPATH];             /* D'Bridge queue directory */

goldlib/gcfg/gs_opus.h

@@ -833,14 +833,14 @@ struct _common_data {
       long crmin;          /* Total minutes given to user ..................*/
       long dbmin;          /* Total minutes used  to user ..................*/
 
-      char u_section[16];		/* String for user current section          */
+      char u_section[16];   /* String for user current section          */
-      char ulikes[16];     /* String of user interest keywords .............*/
+      char ulikes[16];      /* String of user interest keywords .............*/
-      long  fudate;        /* First time user called system in seconds      */
+      int32_t  fudate;      /* First time user called system in seconds      */
-      unsigned long  caller_id;   /* Unique ID for this user. fudate        */
+      uint32_t caller_id;   /* Unique ID for this user. fudate        */
-      unsigned long  Section;		/* What "section" of the bbs the user is in.    */
+      uint32_t Section;     /* What "section" of the bbs the user is in.    */
-      word  menu_mode;     /* What menu the user was at last ...............*/
+      word  menu_mode;      /* What menu the user was at last ...............*/
-      word  TwoBits;  		/* More user configuration flags                */
+      word  TwoBits;        /* More user configuration flags                */
-      word  After_Externs;		/* Any special flags from external?         */
+      word  After_Externs;  /* Any special flags from external?         */
       byte  msecs;     /* Number of message areas in User sections defined  */
       byte  fsecs;     /* Number of file areas in User sections defined     */
 
@@ -849,14 +849,14 @@ struct _common_data {
       word lastmsg[MAXLREAD];       /* All the last message read stuff .....*/
 #else
 /* New for Opus 1.20 */
-       char    Address[32];		/* User's address                        */
+       char    Address[32];   /* User's address                        */
-       char    My_Ans[64];		    /* Reply to prm.My_Question              */
+       char    My_Ans[64];    /* Reply to prm.My_Question              */
-       char    Strfill[32];		/* Filler for more strings               */
+       char    Strfill[32];   /* Filler for more strings               */
-       char    bday_mon;   		/* User's birthday/month                 */
+       char    bday_mon;      /* User's birthday/month                 */
-       char    bday_day;   		/* User's birthday/day                   */
+       char    bday_day;      /* User's birthday/day                   */
-       short     bday_year;               /* User's birthday/year                  */
+       short   bday_year;     /* User's birthday/year                  */
-       unsigned long    messages_read;		/* Total number of messages read */
+       uint32_t messages_read;  /* Total number of messages read */
-       long    messages_sent;		/* Number of messages entered by user    */
+       int32_t  messages_sent;  /* Number of messages entered by user    */
 
        word     my_section[MAX_USEC];		/* This is just a block of area  */
                                      		/* numbers in the user's Section */
@@ -873,7 +873,7 @@ struct _common_data {
        byte    User_DMacro[16];		/* Default User's keyboard Macro       */
        byte    Sysop_Comment[80];		/* Anything you want to say about 'em  */
 #endif
-      unsigned long OPUS_id;
+      uint32_t OPUS_id;
 
                            /* The next 7 sets of id and inf data are for    */
                            /* external programs to use for auxialliary inf. */
@@ -1413,17 +1413,17 @@ struct  _ascan {		/* structure of address for echoScanning */
 /* LMR is used in LREAD.DAT to store the user's last message read counter   */
 /*--------------------------------------------------------------------------*/
 struct  _lmr {
-    unsigned long    user_id;
+    uint32_t  user_id;
-    word    high_msg;
+    word      high_msg;
-    word    last_msg;
+    word      last_msg;
 };
 
 /*--------------------------------------------------------------------------*/
 /* LF is used to store the last time a user has accessed each area          */
 /*--------------------------------------------------------------------------*/
 struct  _lf {
-    unsigned long    user_id;
+    uint32_t  user_id;
-    unsigned long    last_timestamp;
+    uint32_t  last_timestamp;
 }; 
 
 /*--------------------------------------------------------------------------*/

goldlib/gcfg/gs_pb200.h

@@ -56,12 +56,12 @@ The combined boards are stored in 25 bytes (200 bits). One bit per message
 area.
 */
 
-typedef unsigned long accessflags;
+typedef uint32_t accessflags;
-typedef unsigned char combinedboards[125];
+typedef uint8_t  combinedboards[125];
-typedef unsigned char pb_bool;
+typedef uint8_t  pb_bool;
-typedef unsigned char pb_Time[3];
+typedef uint8_t  pb_Time[3];
-typedef unsigned char Date[3];
+typedef uint8_t  Date[3];
-typedef unsigned char TimeFrame[7][6];
+typedef uint8_t  TimeFrame[7][6];
 
 /*
 ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ

goldlib/gcfg/gs_xbbs.h

@@ -296,23 +296,23 @@ struct _msgarea
     char            *usenettag;
     int             minage;
     int             maxage;
-    unsigned long   r_security1;
+    uint32_t        r_security1;
-    unsigned long   r_security2;
+    uint32_t        r_security2;
-    unsigned long   r_flags1;
+    uint32_t        r_flags1;
-    unsigned long   r_flags2;
+    uint32_t        r_flags2;
-    unsigned long   w_security1;
+    uint32_t        w_security1;
-    unsigned long   w_security2;
+    uint32_t        w_security2;
-    unsigned long   w_flags1;
+    uint32_t        w_flags1;
-    unsigned long   w_flags2;
+    uint32_t        w_flags2;
-    unsigned long   s_security1;
+    uint32_t        s_security1;
-    unsigned long   s_security2;
+    uint32_t        s_security2;
-    unsigned long   s_flags1;
+    uint32_t        s_flags1;
-    unsigned long   s_flags2;
+    uint32_t        s_flags2;
-    unsigned long   areaflags;
+    uint32_t        areaflags;
-    unsigned long   *groupnum;
+    uint32_t        *groupnum;
-        PADDR           addr;
+    PADDR           addr;
     PADDR           feeds;
-    unsigned int    number;
+    uint32_t        number;
     int32_t         TimeFactor;
     char            *password;
     struct _msgarea *next;
@@ -352,22 +352,22 @@ struct _filearea
     char             *descr;
     int             minage;
     int             maxage;
-    unsigned long    r_security1;
+    uint32_t         r_security1;
-    unsigned long    r_security2;
+    uint32_t         r_security2;
-    unsigned long    r_flags1;
+    uint32_t         r_flags1;
-    unsigned long    r_flags2;
+    uint32_t         r_flags2;
-    unsigned long    w_security1;
+    uint32_t         w_security1;
-    unsigned long    w_security2;
+    uint32_t         w_security2;
-    unsigned long    w_flags1;
+    uint32_t         w_flags1;
-    unsigned long    w_flags2;
+    uint32_t         w_flags2;
-    unsigned long    s_security1;
+    uint32_t         s_security1;
-    unsigned long    s_security2;
+    uint32_t         s_security2;
-    unsigned long    s_flags1;
+    uint32_t         s_flags1;
-    unsigned long    s_flags2;
+    uint32_t         s_flags2;
-    unsigned long    areaflags;
+    uint32_t         areaflags;
-    unsigned long    groupnum[256];
+    uint32_t         groupnum[256];
     int              cost_per_k;
-    unsigned int     number;
+    uint32_t         number;
     char             *upath;
     char             *dpath;
     char             *password;
@@ -409,20 +409,20 @@ typedef struct _libarea
     char            *descr;
     int             minage;
     int             maxage;
-    unsigned long   r_security1;
+    uint32_t        r_security1;
-    unsigned long   r_security2;
+    uint32_t        r_security2;
-    unsigned long   r_flags1;
+    uint32_t        r_flags1;
-    unsigned long   r_flags2;
+    uint32_t        r_flags2;
-    unsigned long   w_security1;
+    uint32_t        w_security1;
-    unsigned long   w_security2;
+    uint32_t        w_security2;
-    unsigned long   w_flags1;
+    uint32_t        w_flags1;
-    unsigned long   w_flags2;
+    uint32_t        w_flags2;
-    unsigned long   s_security1;
+    uint32_t        s_security1;
-    unsigned long   s_security2;
+    uint32_t        s_security2;
-    unsigned long   s_flags1;
+    uint32_t        s_flags1;
-    unsigned long   s_flags2;
+    uint32_t        s_flags2;
-    unsigned long   areaflags;
+    uint32_t        areaflags;
-    unsigned int    number;
+    uint32_t        number;
     char            *path;
     char            *password;
     struct _libarea *next;

goldlib/msgidlib/typedefs.h

@@ -3,44 +3,6 @@
 #ifndef __TYPEDEFS_H__
 #define __TYPEDEFS_H__
 
-#ifndef __goldall_h
+#include <gdefs.h>
-#ifdef _MSC_VER
-#include <windows.h>
-#include <limits.h>
-
-#if (UCHAR_MAX == 0xFF)
-typedef   signed char    int8_t;
-typedef unsigned char   uint8_t;
-#else
-#error Don't know how to define 8 bit integers
-#endif
-#if (USHRT_MAX == 0xFFFF)
-typedef   signed short   int16_t;
-typedef unsigned short  uint16_t;
-#else
-#error Don't know how to define 16 bit integers
-#endif
-#if (UINT_MAX == 0xFFFFFFFF)
-typedef   signed int     int32_t;
-typedef unsigned int    uint32_t;
-#else
-#error Don't know how to define 32 bit integers
-#endif
-
-#else
-#include <stdint.h>
-#endif  //#ifdef _MSC_VER
-
-typedef uint8_t   bit;
-
-typedef  int8_t   sbyte;
-typedef uint8_t   byte;
-
-typedef uint16_t  word;
-typedef uint16_t  ushort;
-
-typedef uint32_t  dword;
-
-#endif  //#ifndef __goldall_h
 
 #endif  //#ifndef __TYPEDEFS_H__

goldlib/smblib/smbdefs.h

@@ -39,49 +39,8 @@
 #define _SMBDEFS_H
 
 #include <stdio.h>
+#include <gdefs.h>
 
-#ifndef __goldall_h
-#ifdef _MSC_VER
-#include <windows.h>
-#include <limits.h>
-
-#if (UCHAR_MAX == 0xFF)
-typedef   signed char    int8_t;
-typedef unsigned char   uint8_t;
-#else
-#error Don't know how to define 8 bit integers
-#endif
-#if (USHRT_MAX == 0xFFFF)
-typedef   signed short   int16_t;
-typedef unsigned short  uint16_t;
-#else
-#error Don't know how to define 16 bit integers
-#endif
-#if (UINT_MAX == 0xFFFFFFFF)
-typedef   signed int     int32_t;
-typedef unsigned int    uint32_t;
-#else
-#error Don't know how to define 32 bit integers
-#endif
-
-#else
-#include <stdint.h>
-#endif  //#ifdef _MSC_VER
-
-typedef unsigned int uint;
-
-typedef uint8_t   bit;
-
-typedef  int8_t   sbyte;
-typedef uint8_t   byte;
-
-typedef uint16_t  word;
-typedef uint16_t  ushort;
-
-typedef uint32_t  dword;
-typedef uint32_t  time32_t;   /* 32-bit time_t type */
-
-#endif  //#ifndef __goldall_h
 
 /**********/
 /* Macros */