ChangeLogTag:Thu May 15 17:01:28 UTC 2003 Don Hinton <dhinton@dresystems.com>dre_osh_01

6 files changed, 70 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index 13a3ce4fa67..e866a0d38c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Thu May 15 17:01:28 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/OS.h:
+		  Adding #include of ace/os_include/sys/sem.h and
+          ace/os_include/errno.h/
+
+        * ace/config-win32-msvc.h:
+		  Added ACE_LACKS_DIRENT_H, ACE_LACKS_DLFCN_H,
+          ACE_LACKS_NETDB_H, and ACE_LACKS_NET_IF_H defines.
+
+        * ace/os_include/dlfcn.h:
+        * ace/os_include/sys/mman.h:
+          Rearranged ACE_WIN32 #ifdef's.
+
+        * ace/os_include/limits.h:
+          Fixed a typo.
+
 Thu May 15 00:12:34 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/os_include/limits.h:
diff --git a/ace/OS.h b/ace/OS.h
index 844f9ca4c4c..8de09515805 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -40,6 +40,8 @@
 #include "ace/os_include/netdb.h"
 #include "ace/os_include/sys/socket.h"
 #include "ace/os_include/net/if.h"
+#include "ace/os_include/sys/sem.h"
+#include "ace/os_include/errno.h"
 
 #include "ace/Time_Value.h"
 
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index b407a569dfa..bb16821ddab 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -59,7 +59,11 @@
 #include <malloc.h>
 #define ACE_HAS_ALLOCA 1
 
+#define ACE_LACKS_DIRENT_H
+#define ACE_LACKS_DLFCN_H
 #define ACE_LACKS_INTTYPES_H
+#define ACE_LACKS_NETDB_H
+#define ACE_LACKS_NET_IF_H
 #define ACE_LACKS_NETINET_IN_H
 #define ACE_LACKS_STDINT_H
 #define ACE_LACKS_STROPTS_H
diff --git a/ace/os_include/dlfcn.h b/ace/os_include/dlfcn.h
index d60c0205c28..276f132a0f6 100644
--- a/ace/os_include/dlfcn.h
+++ b/ace/os_include/dlfcn.h
@@ -34,6 +34,10 @@
 #  endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */
 #endif /* !ACE_LACKS_DLFCN_H */
 
+/* Set the proper handle type for dynamically-loaded libraries. */
+/* Also define a default 'mode' for loading a library - the names and values */
+/* differ between OSes, so if you write code that uses the mode, be careful */
+/* of the platform differences. */
 #if defined (ACE_PSOS)
    typedef ACE_HANDLE ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE ACE_INVALID_HANDLE
@@ -43,36 +47,29 @@
    typedef HINSTANCE ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
 #  define ACE_DEFAULT_SHLIB_MODE 0
+#elif defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
+   typedef void *ACE_SHLIB_HANDLE;
+#  define ACE_SHLIB_INVALID_HANDLE 0
+#  if defined (__KCC) && defined(RTLD_GROUP) && defined(RTLD_NODELETE)
+#    define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GROUP | RTLD_NODELETE
+#  else
+#    define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
+#  endif /* KCC */
+#elif defined (__hpux)
+#  if defined(__GNUC__) || __cplusplus >= 199707L
+#    include /**/x <dl.h>
+#  else
+#    include /**/x <cxxdl.h>
+#  endif /* (g++ || HP aC++) vs. HP C++ */
+   typedef shl_t ACE_SHLIB_HANDLE;
+#  define ACE_SHLIB_INVALID_HANDLE 0
+#  define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED
+#else /* !ACE_PSOS && !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */
+   typedef void *ACE_SHLIB_HANDLE;
+#  define ACE_SHLIB_INVALID_HANDLE 0
+#  define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
 #endif /* ACE_PSOS */
 
-/* Set the proper handle type for dynamically-loaded libraries. */
-/* Also define a default 'mode' for loading a library - the names and values */
-/* differ between OSes, so if you write code that uses the mode, be careful */
-/* of the platform differences. */
-#   if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
-  typedef void *ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
-#   if defined (__KCC) && defined(RTLD_GROUP) && defined(RTLD_NODELETE)
-#   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GROUP | RTLD_NODELETE
-#   else
-#   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
-#   endif /* KCC */
-#   elif defined (__hpux)
-#     if defined(__GNUC__) || __cplusplus >= 199707L
-#       include /**/x <dl.h>
-#     else
-#       include /**/x <cxxdl.h>
-#     endif /* (g++ || HP aC++) vs. HP C++ */
-  typedef shl_t ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
-#   define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED
-#   else
-  typedef void *ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
-#   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
-
-#   endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
-
 #if !defined (RTLD_LAZY)
 #define RTLD_LAZY 1
 #endif /* !RTLD_LAZY */
diff --git a/ace/os_include/limits.h b/ace/os_include/limits.h
index 4879c5bf6a3..6a8224da12b 100644
--- a/ace/os_include/limits.h
+++ b/ace/os_include/limits.h
@@ -66,8 +66,10 @@
 #if !defined (PATH_MAX)
 #  if defined (_MAX_PATH)
 #    define PATH_MAX _MAX_PATH
+#  elif defined (MAX_PATH)
+#    define PATH_MAX MAX_PATH
 #  else /* !_MAX_PATH */
-#    define 1024
+#    define PATH_MAX 1024
 #  endif /* _MAX_PATH */
 #endif /* !PATH_MAX */
 
diff --git a/ace/os_include/sys/mman.h b/ace/os_include/sys/mman.h
index 202c29312d6..f22124a927f 100644
--- a/ace/os_include/sys/mman.h
+++ b/ace/os_include/sys/mman.h
@@ -39,27 +39,15 @@
 #  if defined (ACE_HAS_BROKEN_MMAP_H)
      }
 #  endif /* ACE_HAS_BROKEN_MMAP_H */
-#else /* ACE_LACKS_SYS_MMAH */
-#  define PROT_READ 0
-#  define PROT_WRITE 0
-#  define PROT_EXEC 0
-#  define PROT_NONE 0
-#  define PROT_RDWR 0
-#  define MAP_PRIVATE 0
-#  define MAP_SHARED 0
-#  define MAP_FIXED 0
-#endif /* !ACE_LACKS_SYS_MMAN_H */
-
-#if defined (ACE_WIN32)
-// These two may be used for internal flags soon:
-#   define MAP_PRIVATE 1
-#   define MAP_SHARED  2
-#   define MAP_FIXED   4
-
-// MMAP flags
-#   define PROT_READ PAGE_READONLY
-#   define PROT_WRITE PAGE_READWRITE
-#   define PROT_RDWR PAGE_READWRITE
+#elif defined (ACE_WIN32)
+   // These two may be used for internal flags soon:
+#  define MAP_PRIVATE 1
+#  define MAP_SHARED  2
+#  define MAP_FIXED   4
+   // MMAP flags
+#  define PROT_READ PAGE_READONLY
+#  define PROT_WRITE PAGE_READWRITE
+#  define PROT_RDWR PAGE_READWRITE
 /* If we can find suitable use for these flags, here they are:
 PAGE_WRITECOPY
 PAGE_EXECUTE
@@ -69,7 +57,16 @@ PAGE_EXECUTE_WRITECOPY
 PAGE_GUARD
 PAGE_NOACCESS
 PAGE_NOCACHE  */
-#endif /* ACE_WIN32 */
+#else /* ACE_WIN32 */
+#  define PROT_READ 0
+#  define PROT_WRITE 0
+#  define PROT_EXEC 0
+#  define PROT_NONE 0
+#  define PROT_RDWR 0
+#  define MAP_PRIVATE 0
+#  define MAP_SHARED 0
+#  define MAP_FIXED 0
+#endif /* !ACE_LACKS_SYS_MMAN_H */
 
 #if !defined (PROT_RDWR)
 #  define PROT_RDWR (PROT_READ|PROT_WRITE)