Tue Aug 22 18:51:34 2000 Luther J Baker <luther@cs.wustl.edu>

9 files changed, 164 insertions, 64 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index a6affda9635..ea6194bc7ba 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,6 @@
+Tue Aug 22 18:51:34 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+
 Tue Aug 22 17:58:38 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* PACE/ChangeLog:
diff --git a/PACE/pace/win32/dirent.h b/PACE/pace/win32/dirent.h
index 81751543fca..9a379a35a12 100644
--- a/PACE/pace/win32/dirent.h
+++ b/PACE/pace/win32/dirent.h
@@ -26,7 +26,7 @@ extern "C" {
 #ifndef PACE_DIRENT_T
 #define PACE_DIRENT_T
 
-  typedef struct dirent {
+  typedef struct /* dirent */ {
     unsigned short d_ino;
     unsigned short d_off;
     unsigned short d_reclen;
@@ -40,7 +40,7 @@ extern "C" {
 
   typedef WIN32_FIND_DATA PACE_TEXT_WIN32_FIND_DATA;
 
-  typedef struct DIR {
+  typedef struct /* DIR */ {
     char * directory_name_;
     // The name of the directory we are looking into
     HANDLE current_handle_;
diff --git a/PACE/pace/win32/signal.h b/PACE/pace/win32/signal.h
index b0ca85eeaf6..51eb576c9b3 100644
--- a/PACE/pace/win32/signal.h
+++ b/PACE/pace/win32/signal.h
@@ -32,8 +32,7 @@ extern "C" {
 
 #ifndef PACE_SIGSET_T
 #define PACE_SIGSET_T
-  typedef struct sigset_t
-  {
+  typedef struct /* sigset_t */ {
     /* signal set type */
     unsigned int sigbits_[4];
   } pace_sigset_t;
@@ -42,7 +41,7 @@ extern "C" {
 #ifndef PACE_SIGACTION_S
 #define PACE_SIGACTION_S
   typedef void (__cdecl *pace_sig_pf)(int);
-  typedef struct sigaction {
+  typedef struct /* sigaction */ {
     int sa_flags;
     pace_sig_pf sa_handler;
     pace_sigset_t sa_mask;
@@ -51,8 +50,8 @@ extern "C" {
 
 #ifndef PACE_SIGINFO_T
 #define PACE_SIGINFO_T
-  typedef struct siginfo_t
-  {
+  typedef struct /* siginfo_t */ {
+
     PACE_HANDLE si_handle_;
     // Win32 HANDLE that has become signaled.
 
diff --git a/PACE/pace/win32/stdio.h b/PACE/pace/win32/stdio.h
index c4c4190fdf0..f765305c77c 100644
--- a/PACE/pace/win32/stdio.h
+++ b/PACE/pace/win32/stdio.h
@@ -23,29 +23,66 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#define PACE_BUFSIZ BUFSIZ
-#define PACE_EOF EOF
-#define PACE_FILENAME_MAX FILENAME_MAX
-#define PACE_L_ctermid L_ctermid
-#define PACE_L_cuserid L_cuserid
-#define PACE_NULL NULL
-#define PACE_SEEK_CUR SEEK_CUR
-#define PACE_SEEK_END SEEK_END
-#define PACE_SEEK_SET SEEK_SET
-#define PACE_TMP_MAX TMP_MAX
-#define pace_stderr stderr
-#define pace_stdout stdout
-#define pace_stdin stdin
-
-typedef fpos_t pace_fpos_t;
+  typedef FILE PACE_FILE;
+  typedef fpos_t pace_fpos_t;
+
+# ifndef PACE_BUSIZ
+# define PACE_BUFSIZ BUFSIZ
+# endif /* PACE_BUFSIZ */
+
+# ifndef PACE_EOF
+# define PACE_EOF EOF
+# endif /* PACE_EOF */
+
+# ifndef PACE_FILENAME_MAX
+# define PACE_FILENAME_MAX FILENAME_MAX
+# endif /* PACE_FILENAME_MAX */
+
+# ifndef PACE_L_ctermid
+# define PACE_L_ctermid L_ctermid
+# endif /* PACE_L_ctermid */
+
+# ifndef PACE_L_cuserid
+# define PACE_L_cuserid L_cuserid
+# endif /* PACE_L_cuserid */
+
+# ifndef PACE_NULL
+# define PACE_NULL NULL
+# endif /* PACE_NULL */
+
+# ifndef PACE_SEEK_CUR
+# define PACE_SEEK_CUR SEEK_CUR
+# endif /* PACE_SEEK_CUR */
+
+# ifndef PACE_SEEK_END
+# define PACE_SEEK_END SEEK_END
+# endif /* PACE_SEEK_END */
+
+# ifndef PACE_SEEK_SET
+# define PACE_SEEK_SET SEEK_SET
+# endif /* PACE_SEEK_SET */
+
+# ifndef PACE_TMP_MAX
+# define PACE_TMP_MAX TMP_MAX
+# endif /* PACE_TMP_MAX */
+
+# ifndef pace_stderr
+# define pace_stderr stderr
+# endif /* pace_stderr */
+
+# ifndef pace_stdout
+# define pace_stdout stdout
+# endif /* pace_stdout */
+
+# ifndef pace_stdin
+# define pace_stdin stdin
+# endif
 
 #ifndef PACE_SIZE_T
-#define PACE_SIZE_T
+#define PACE_SIZE_T 1
   typedef size_t pace_size_t;
 #endif /* PACE_SIZE_T */
 
-typedef FILE PACE_FILE;
-
 #if defined (PACE_HAS_CPLUSPLUS)
 }
 #endif /* PACE_HAS_CPLUSPLUS */
diff --git a/PACE/pace/win32/stdlib.h b/PACE/pace/win32/stdlib.h
index 64d0f5314df..01a93eded34 100644
--- a/PACE/pace/win32/stdlib.h
+++ b/PACE/pace/win32/stdlib.h
@@ -23,22 +23,36 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#define PACE_EXIT_FAILURE EXIT_FAILURE
-#define PACE_EXIT_SUCCESS EXIT_SUCCESS
-#define PACE_MB_CUR_MAX MB_CUR_MAX
-#define PACE_NULL NULL
-#define PACE_RAND_MAX RAND_MAX
+  typedef div_t pace_div_t;
+  typedef ldiv_t pace_ldiv_t;
 
-typedef div_t pace_div_t;
-typedef ldiv_t pace_ldiv_t;
+# ifndef PACE_EXIT_FAILURE
+# define PACE_EXIT_FAILURE EXIT_FAILURE
+# endif /* PACE_EXIT_FAILURE */
+
+# ifndef PACE_EXIT_SUCCESS
+# define PACE_EXIT_SUCCESS EXIT_SUCCESS
+# endif /* PACE_EXIT_SUCCESS */
+
+# ifndef PACE_MB_CUR_MAX
+# define PACE_MB_CUR_MAX MB_CUR_MAX
+# endif /* PACE_MB_CUR_MAX */
+
+# ifndef PACE_NULL
+# define PACE_NULL NULL
+# endif /* PACE_NULL */
+
+# ifndef PACE_RAND_MAX
+# define PACE_RAND_MAX RAND_MAX
+# endif /* PACE_RAND_MAX */
 
 #ifndef PACE_SIZE_T
-#define PACE_SIZE_T
+#define PACE_SIZE_T 1
   typedef size_t pace_size_t;
 #endif /* PACE_SIZE_T */
 
 #ifndef PACE_WCHAR_T
-#define PACE_WCHAR_T
+#define PACE_WCHAR_T 1
   typedef wchar_t pace_wchar_t;
 #endif /* PACE_WCHAR_T */
 
diff --git a/PACE/pace/win32/time.h b/PACE/pace/win32/time.h
index 8358ec9124b..aeaf12e0771 100644
--- a/PACE/pace/win32/time.h
+++ b/PACE/pace/win32/time.h
@@ -23,51 +23,65 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#define PACE_CLK_TCK CLK_TCK
-#define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC
-#define PACE_CLOCK_REALTIME CLOCK_REALTIME
-#define PACE_NULL NULL
-#define PACE_TIMER_ABSTIME TIMER_ABSTIME
+# ifndef PACE_CLK_TCK
+# define PACE_CLK_TCK CLK_TCK
+# endif /* PACE_CLK_TCK */
+
+# ifndef PACE_CLOCKS_PER_SEC
+# define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC
+# endif /* PACE_CLOCKS_PER_SEC */
+
+# ifndef PACE_CLOCK_REALTIME
+# define PACE_CLOCK_REALTIME CLOCK_REALTIME
+# endif /* PACE_CLOCK_REALTIME */
+
+# ifndef PACE_NULL
+# define PACE_NULL NULL
+# endif /* PACE_NULL */
+
+# ifndef PACE_TIMER_ABSTIME
+# define PACE_TIMER_ABSTIME TIMER_ABSTIME
+# endif /* PACE_TIMER_ABSTIME */
 
 #ifndef PACE_CLOCKID_T
-#define PACE_CLOCKID_T
+#define PACE_CLOCKID_T 1
   typedef int clockid_t;
   typedef clockid_t pace_clockid_t;
 #endif /* PACE_CLOCKID_T */
 
 #ifndef PACE_CLOCK_T
-#define PACE_CLOCK_T
+#define PACE_CLOCK_T 1
   typedef clock_t pace_clock_t;
 #endif /* PACE_CLOCK_T */
 
 #ifndef PACE_TIMER_T
-#define PACE_TIMER_T
+#define PACE_TIMER_T 1
   typedef long timer_t;
   typedef timer_t pace_timer_t;
 #endif /* PACE_TIMER_T */
 
 #ifndef PACE_TIME_T
-#define PACE_TIME_T
+#define PACE_TIME_T 1
   typedef time_t pace_time_t;
 #endif /* PACE_TIME_T */
 
 #ifndef PACE_TM
-#define PACE_TM
+#define PACE_TM 1
   typedef struct tm pace_tm;
 #endif /* PACE_TM */
 
 #ifndef PACE_TIMESPEC
-#define PACE_TIMESPEC
+#define PACE_TIMESPEC 1
   typedef struct timespec pace_timespec;
 #endif /* PACE_TIMESPEC */
 
 #ifndef PACE_ITIMERSPEC
-#define PACE_ITIMERSPEC
+#define PACE_ITIMERSPEC 1
   typedef struct itimerspec pace_itimerspec;
 #endif /* PACE_ITIMERSPEC */
 
 #ifndef PACE_SIGVAL
-#define PACE_SIGVAL
+#define PACE_SIGVAL 1
   typedef union sigval {
     int sival_int;                 /* integer value */
     void * sival_ptr;              /* pointer value */
@@ -75,7 +89,7 @@ extern "C" {
 #endif  /* PACE_SIGVAL */
 
 #ifndef PACE_SIGEVENT
-#define PACE_SIGEVENT
+#define PACE_SIGEVENT 1
   typedef struct sigevent {
     int sigev_notify;             /* notification mode */
     int sigev_signo;              /* signal number */
diff --git a/PACE/pace/win32/types.h b/PACE/pace/win32/types.h
index b7ebdeda9cd..c48b4f326d3 100644
--- a/PACE/pace/win32/types.h
+++ b/PACE/pace/win32/types.h
@@ -83,8 +83,9 @@ extern "C" {
 
 #ifndef PACE_SSIZE_T
 #define PACE_SSIZE_T
-  typedef long ssize_t;
-  typedef ssize_t pace_ssize_t;
+  /* typedef long ssize_t;
+   * typedef ssize_t pace_ssize_t; */
+  typedef long pace_ssize_t;
 #endif /* PACE_SSIZE_T */
 
 #ifndef PACE_UID_T
diff --git a/PACE/pace/win32/unistd.h b/PACE/pace/win32/unistd.h
index 9a12306aed6..bcd548879d5 100644
--- a/PACE/pace/win32/unistd.h
+++ b/PACE/pace/win32/unistd.h
@@ -22,27 +22,59 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#define PACE_F_OK F_OK
-#define PACE_NULL NULL
-#define PACE_R_OK R_OK
-#define PACE_SEEK_CUR SEEK_CUR
-#define PACE_SEEK_END SEEK_END
-#define PACE_SEEK_SET SEEK_SET
-#define PACE_STDERR_FILENO STDERR_FILENO
-#define PACE_STDIN_FILENO STDIN_FILENO
-#define PACE_STDOUT_FILENO STDOUT_FILENO
-#define PACE_W_OK W_OK
-#define PACE_X_OK X_OK
+# ifndef PACE_F_OK
+# define PACE_F_OK F_OK
+# endif /* PACE_F_OK */
+
+# ifndef PACE_NULL
+# define PACE_NULL NULL
+# endif /* PACE_NULL */
+
+# ifndef PACE_R_OK
+# define PACE_R_OK R_OK
+# endif /* PACE_R_OK */
+
+# ifndef PACE_SEEK_CUR
+# define PACE_SEEK_CUR SEEK_CUR
+# endif /* PACE_SEEK_CUR */
+
+# ifndef PACE_SEEK_END
+# define PACE_SEEK_END SEEK_END
+# endif /* PACE_SEEK_END */
+
+# ifndef PACE_SEEK_SET
+# define PACE_SEEK_SET SEEK_SET
+# endif /* PACE_SEEK_SET */
+
+# ifndef PACE_STDERR_FILENO
+# define PACE_STDERR_FILENO STDERR_FILENO
+# endif /* PACE_STDERR_FILENO */
+
+# ifndef PACE_STDIN_FILENO
+# define PACE_STDIN_FILENO STDIN_FILENO
+# endif /* PACE_STDIN_FILENO */
+
+# ifndef PACE_STDOUT_FILENO
+# define PACE_STDOUT_FILENO STDOUT_FILENO
+# endif /* PACE_STDOUT_FILENO */
+
+# ifndef PACE_W_OK
+# define PACE_W_OK W_OK
+# endif /* PACE_W_OK */
+
+# ifndef PACE_X_OK
+# define PACE_X_OK X_OK
+# endif /* PACE_X_OK */
 
 /* _POSIX _PC _SC Macros go here */
 
 #ifndef PACE_SIZE_T
-#define PACE_SIZE_T
+#define PACE_SIZE_T 1
 typedef size_t pace_size_t;
 #endif /* PACE_SIZE_T */
 
 #ifndef PACE_SSIZE_T
-#define PACE_SSIZE_T
+#define PACE_SSIZE_T 1
 typedef ssize_t pace_ssize_t;
 #endif /* PACE_SSIZE_T */
 
diff --git a/PACE/pace/win32/utsname.h b/PACE/pace/win32/utsname.h
index d7115856b92..c603b6b2c31 100644
--- a/PACE/pace/win32/utsname.h
+++ b/PACE/pace/win32/utsname.h
@@ -23,7 +23,7 @@ extern "C" {
 # ifndef PACE_UTSNAME
 # define PACE_UTSNAME
 # define PACE_SYS_NMLN 257
-  typedef struct utsname {
+  typedef struct /* utsname */ {
     char sysname[PACE_SYS_NMLN];
     char nodename[PACE_SYS_NMLN];
     char release[PACE_SYS_NMLN];