Fri Feb 9 19:35:29 2001 Luther J Baker <luther@cs.wustl.edu>

11 files changed, 97 insertions, 26 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index 96faccc9792..52015743012 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,43 +1,62 @@
+Fri Feb  9 19:35:29 2001  Luther J Baker  <luther@cs.wustl.edu>
+
+        * pace/config/compiler.h
+        * pace/config/utility.h
+        * pace/config/fcntl.h
+        * pace/win32/mman.inl
+        * pace/win32/pthread.h
+        * pace/win32/semaphore.inl
+        * pace/win32/stat.inl
+        * pace/win32/stdio.inl
+        * pace/win32/types.h
+        * pace/win32/unistd.inl
+        * pace/win32/utime.h
+        * pace/win32/utime.inl
+
+          Thanks to Christopher Kohlhoff <chris@kohlhoff.com>
+          for making the changes necessary to port PACE to
+          Borland C++ Builder 5.
+
 Thu Feb  1 17:36:24 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-	* pace/win32/signal.h (PACE_SIGSET_T):
-	* pace/win32/signal.inl (pace_sigfillset):	
+        * pace/win32/signal.h (PACE_SIGSET_T):
+        * pace/win32/signal.inl (pace_sigfillset):
 
-	  Used ACE implementation.
+          Used ACE implementation.
 
 Sun Jan 28 13:20:28 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-	* pace/posix/unistd.inl (pace_getlogin_r):
+        * pace/posix/unistd.inl (pace_getlogin_r):
 
-	  Changed C++ style comments to C.
+          Changed C++ style comments to C.
 
 Thu Jan 25 17:26:41 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-	* pace/posix/unistd.inl (pace_access):
+        * pace/posix/unistd.inl (pace_access):
 
-	  Yet another change to the illustrious function.
-	  Let it be noted that there needs to be a better test for
-	  the _REENTRANT policy. Linux supports 'these' calls but
-	  is currently forced to the emulation code.
+          Yet another change to the illustrious function.
+          Let it be noted that there needs to be a better test for
+          the _REENTRANT policy. Linux supports 'these' calls but
+          is currently forced to the emulation code.
 
-	  The #if (PACE_SUNOS) || (PACE_LYNXOS) should not be here.
-	  Instead, there should be a simple test like PACE_HAS_REENTRANT
-	  or something even higher (such as in ACE: ACE_MT_SAFE).
+          The #if (PACE_SUNOS) || (PACE_LYNXOS) should not be here.
+          Instead, there should be a simple test like PACE_HAS_REENTRANT
+          or something even higher (such as in ACE: ACE_MT_SAFE).
 
 Tue Jan 23 14:56:51 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-	* pace/posix/unistd.inl (pace_getlogin_r):
+        * pace/posix/unistd.inl (pace_getlogin_r):
 
-	  Rewrote code and based preprocessor selection on
-	  PACE_HAS_REENTRANT as opposed to PACE_LYNXOS, PACE_SUNOS
-	  on an otherwise defined platform macro.
+          Rewrote code and based preprocessor selection on
+          PACE_HAS_REENTRANT as opposed to PACE_LYNXOS, PACE_SUNOS
+          on an otherwise defined platform macro.
 
 Fri Jan 19 12:43:27 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* pace/posix/socket.h: 
-	  Added a check for HPUX so that pace_family_t is not defined for
-	  HPUX.
-          
+        * pace/posix/socket.h:
+          Added a check for HPUX so that pace_family_t is not defined for
+          HPUX.
+
 Thu Jan 18 15:22:07 2001  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * tests/Stdio_Test.c (main):
@@ -72,12 +91,12 @@ Mon Jan 15 10:44:39 2001  Darrell Brunsch <brunsch@uci.edu>
           - Fixed the intermediate and output directories to
             fit the model used in ACE.
 
-          - Changed the names of the two pace* projects so 
+          - Changed the names of the two pace* projects so
             msvc_auto_compile.pl will be able to recognize
             them as libraries.
 
           - Added two new configurations to test_stdio so it
-            now can link to both the dynamic and static 
+            now can link to both the dynamic and static
             version of PACE.
 
           - Changed the configuration name of the static
diff --git a/PACE/pace/win32/fcntl.h b/PACE/pace/win32/fcntl.h
index c3b91b0f900..7cb57a52cb0 100644
--- a/PACE/pace/win32/fcntl.h
+++ b/PACE/pace/win32/fcntl.h
@@ -25,6 +25,10 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
+#if defined (__BORLANDC__)
+#define _O_TEMPORARY 0x08
+#endif /* __BORLANDC__ */
+
 #define PACE_FD_CLOEXEC FD_CLOEXEC
 #define PACE_F_DUPFD D_DUPFD
 #define PACE_F_GETFD F_GETFD
diff --git a/PACE/pace/win32/mman.inl b/PACE/pace/win32/mman.inl
index 1b0abb8ee1b..c324089991b 100644
--- a/PACE/pace/win32/mman.inl
+++ b/PACE/pace/win32/mman.inl
@@ -120,6 +120,10 @@ PACE_INLINE
 int
 pace_shm_unlink (const char * name)
 {
+#if defined (__BORLANDC__)
+  return unlink (name);
+#else /* __BORLANDC__ */
   return _unlink (name);
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/pthread.h b/PACE/pace/win32/pthread.h
index 32e529e1da5..582b89c2ab1 100644
--- a/PACE/pace/win32/pthread.h
+++ b/PACE/pace/win32/pthread.h
@@ -153,7 +153,7 @@ extern "C" {
 
 #if (PACE_HAS_POSIX_NONUOF_FUNCS)
   int pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-				 void * stackaddr);
+				 void ** stackaddr);
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
 #if (PACE_HAS_POSIX_NONUOF_FUNCS)
diff --git a/PACE/pace/win32/semaphore.inl b/PACE/pace/win32/semaphore.inl
index 796abccb479..dea94013317 100644
--- a/PACE/pace/win32/semaphore.inl
+++ b/PACE/pace/win32/semaphore.inl
@@ -89,7 +89,11 @@ PACE_INLINE
 int
 pace_sem_unlink (const char * name)
 {
+#if defined (__BORLANDC__)
+  return unlink (name);
+#else /* __BORLANDC__ */
   return _unlink (name);
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
diff --git a/PACE/pace/win32/stat.inl b/PACE/pace/win32/stat.inl
index fb45b0ded51..4ebc17eed86 100644
--- a/PACE/pace/win32/stat.inl
+++ b/PACE/pace/win32/stat.inl
@@ -90,6 +90,10 @@ PACE_INLINE
 pace_mode_t
 pace_umask (pace_mode_t cmask)
 {
+#if defined (__BORLANDC__)
+  return umask (cmask);
+#else /* __BORLANDC__ */
   return _umask (cmask);
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_FA_UOF */
diff --git a/PACE/pace/win32/stdio.inl b/PACE/pace/win32/stdio.inl
index fca3384d839..180140149b9 100644
--- a/PACE/pace/win32/stdio.inl
+++ b/PACE/pace/win32/stdio.inl
@@ -49,7 +49,11 @@ FILE *
 pace_fdopen (int fildes,
              const char * type)
 {
+#if defined (__BORLANDC__)
+  return fdopen (fildes, (char *)type);
+#else /* __BORLANDC__ */
   return fdopen (fildes, type);
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_DI_UOF */
 
diff --git a/PACE/pace/win32/types.h b/PACE/pace/win32/types.h
index fdf9f2f2f2e..cd6a7b10cd8 100644
--- a/PACE/pace/win32/types.h
+++ b/PACE/pace/win32/types.h
@@ -17,8 +17,12 @@
 #define PACE_SYS_TYPES_H_WIN32
 
 #include <sys/types.h>
-#include <wtypes.h>
-#include <windef.h>
+#if defined (__BORLANDC__)
+# include <windows.h>
+#else /* __BORLANDC__ */
+# include <wtypes.h>
+# include <windef.h>
+#endif /* __BORLANDC__ */
 
 #if defined (PACE_HAS_CPLUSPLUS)
 extern "C" {
diff --git a/PACE/pace/win32/unistd.inl b/PACE/pace/win32/unistd.inl
index 3270cf19896..bccc6bb6f48 100644
--- a/PACE/pace/win32/unistd.inl
+++ b/PACE/pace/win32/unistd.inl
@@ -53,7 +53,11 @@ PACE_INLINE
 int
 pace_chdir (const char * path)
 {
+#if defined (__BORLANDC__)
+  return chdir (path);
+#else /* __BORLANDC__ */
   return _chdir (path);
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_FS_UOF */
 
@@ -105,7 +109,11 @@ int
 pace_execv (const char * path,
             char * const argv[])
 {
+#if defined (__BORLANDC__)
+  return execv (path, argv);
+#else /* __BORLANDC__ */
   return _execv (path, (const char * const *) argv);
+#endif /* __BORLANDC__ */
   /* if successful, this operation does NOT return */
 }
 #endif /* PACE_HAS_POSIX_MP_UOF */
@@ -117,8 +125,12 @@ pace_execve (const char * path,
              char * const argv[],
              char * const envp[])
 {
+#if defined (__BORLANDC__)
+  return execve (path, argv, envp);
+#else /* __BORLANDC__ */
   return _execve (path, (const char *const *) argv,
                   (const char *const *) envp);
+#endif /* __BORLANDC__ */
   /* if successful, this operation does NOT return */
 }
 #endif /* PACE_HAS_POSIX_MP_UOF */
@@ -129,7 +141,11 @@ int
 pace_execvp (const char * file,
              char * const argv[])
 {
+#if defined (__BORLANDC__)
+  return execvp (file, argv);
+#else /* __BORLANDC__ */
   return _execvp (file, (const char *const *) argv);
+#endif /* __BORLANDC__ */
   /* if successful, this operation does NOT return */
 }
 #endif /* PACE_HAS_POSIX_MP_UOF */
@@ -294,7 +310,11 @@ PACE_INLINE
 int
 pace_isatty (int fildes)
 {
+#if defined (__BORLANDC__)
+  return isatty (fildes);
+#else /* __BORLANDC__ */
   return _isatty (fildes);
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_DS_UOF */
 
diff --git a/PACE/pace/win32/utime.h b/PACE/pace/win32/utime.h
index cfd7e5014ce..5b90db1bd70 100644
--- a/PACE/pace/win32/utime.h
+++ b/PACE/pace/win32/utime.h
@@ -17,7 +17,11 @@
 #define PACE_UTIME_H_WIN32
 
 #include "pace/sys/types.h"
+#if defined (__BORLANDC__)
+#include <utime.h>
+#else
 #include <sys/utime.h>
+#endif /* __BORLANDC__ */
 
 #if defined (PACE_HAS_CPLUSPLUS)
 extern "C" {
diff --git a/PACE/pace/win32/utime.inl b/PACE/pace/win32/utime.inl
index 1154ebd29c4..4a83d7713e0 100644
--- a/PACE/pace/win32/utime.inl
+++ b/PACE/pace/win32/utime.inl
@@ -23,7 +23,11 @@ pace_utime (const char * path,
 {
   /* Emulation not yet finished! Not yet working! */
 
+#if defined (__BORLANDC__)
+  return utime (path, (const struct utimbuf*)times);  
+#else /* __BORLANDC__ */
   /* Not quite the perfect answer... win32 doesn't take const args. */
   return _utime ((char*)path, (struct _utimbuf*)times);  
+#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_FS_UOF */