ChangeLogTag:Thu Sep 16 12:36:29 2004 Steve Huston <shuston@riverace.com>

3 files changed, 31 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 03307ce55eb..6c5fdd1959a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 16 12:36:29 2004  Steve Huston  <shuston@riverace.com>
+
+	* ace/POSIX_Proactor.{h cpp}: Change the SystemType enumerator value
+	  names to begin with ACE_. This avoids conflicts with other facilities
+	  that use an OS_ prefix.
+
 Thu Sep 16 09:22:08 2004  Dale Wilson  <wilson_d@ociweb.com>
 
         * ace/OS_NS_Thread.cpp:
@@ -9,7 +15,6 @@ Thu Sep 16 09:22:08 2004  Dale Wilson  <wilson_d@ociweb.com>
           The original code worked like this but I changed it when
           I added additional cleanup operations to the exit method.
 
-
 Thu Sep 16 08:14:14 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/Memory_Pool.cpp:
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index af93e541c3d..2c31ead9383 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -57,11 +57,11 @@ public:
 
 // *********************************************************************
 ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
-  :  os_id_ (OS_UNDEFINED)
+  :  os_id_ (ACE_OS_UNDEFINED)
 {
 #if defined(sun)
 
-  os_id_ = OS_SUN; // set family
+  os_id_ = ACE_OS_SUN; // set family
 
   char Buf [32];
 
@@ -70,23 +70,23 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
   ACE_OS::sysinfo (SI_RELEASE , Buf, sizeof(Buf)-1);
 
   if (ACE_OS::strcasecmp (Buf , "5.6") == 0)
-    os_id_ = OS_SUN_56;
+    os_id_ = ACE_OS_SUN_56;
   else if (ACE_OS::strcasecmp (Buf , "5.7") == 0)
-    os_id_ = OS_SUN_57;
+    os_id_ = ACE_OS_SUN_57;
   else if (ACE_OS::strcasecmp (Buf , "5.8") == 0)
-    os_id_ = OS_SUN_58;
+    os_id_ = ACE_OS_SUN_58;
 
 #elif defined(HPUX)
 
-  os_id_ = OS_HPUX;   // set family
+  os_id_ = ACE_OS_HPUX;   // set family
 
 #elif defined(__sgi)
 
-  os_id_ = OS_IRIX;   // set family
+  os_id_ = ACE_OS_IRIX;   // set family
 
 #elif defined(__OpenBSD)
 
-  os_id_ = OS_OPENBSD; // set family
+  os_id_ = ACE_OS_OPENBSD; // set family
 
   // do the same
 
@@ -1878,7 +1878,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
   int error_status = 0;
   size_t transfer_count = 0;
 
-  if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == OS_SUN_56)
+  if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == ACE_OS_SUN_56)
     {
       flg_aio = 1;  // AIO signal received
       // define index to start
@@ -1892,7 +1892,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
       // there is one I/O to process, and it's correctly specified in the
       // siginfo received. There are, however, some special situations
       // where this isn't true...
-      if (os_id_ == OS_SUN_56) // Solaris 6
+      if (os_id_ == ACE_OS_SUN_56) // Solaris 6
         {
           // 1. Solaris 6 always loses any RT signal,
           //    if it has more SIGQUEMAX=32 pending signals
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 4c4c905e7cb..e8e0897e3d4 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -74,21 +74,21 @@ public:
 
   enum SystemType  // open for future extention
   {
-    OS_UNDEFINED= 0x0000,
-    OS_WIN      = 0x0100,          // for future
-    OS_WIN_NT   = OS_WIN | 0x0001,
-    OS_WIN_2000 = OS_WIN | 0x0002,
-    OS_SUN      = 0x0200,          // Sun Solaris family
-    OS_SUN_55   = OS_SUN | 0x0001,
-    OS_SUN_56   = OS_SUN | 0x0002,
-    OS_SUN_57   = OS_SUN | 0x0004,
-    OS_SUN_58   = OS_SUN | 0x0008,
-    OS_HPUX     = 0x0400,          // HPUX family
-    OS_HPUX_11  = OS_HPUX | 0x0001,
-    OS_LINUX    = 0x0800,          // Linux family
-    OS_FREEBSD  = 0x1000,          // FreeBSD family
-    OS_IRIX     = 0x2000,          // SGI IRIX family
-    OS_OPENBSD  = 0x4000           // OpenBSD familty
+    ACE_OS_UNDEFINED= 0x0000,
+    ACE_OS_WIN      = 0x0100,          // for future
+    ACE_OS_WIN_NT   = ACE_OS_WIN | 0x0001,
+    ACE_OS_WIN_2000 = ACE_OS_WIN | 0x0002,
+    ACE_OS_SUN      = 0x0200,          // Sun Solaris family
+    ACE_OS_SUN_55   = ACE_OS_SUN | 0x0001,
+    ACE_OS_SUN_56   = ACE_OS_SUN | 0x0002,
+    ACE_OS_SUN_57   = ACE_OS_SUN | 0x0004,
+    ACE_OS_SUN_58   = ACE_OS_SUN | 0x0008,
+    ACE_OS_HPUX     = 0x0400,          // HPUX family
+    ACE_OS_HPUX_11  = ACE_OS_HPUX | 0x0001,
+    ACE_OS_LINUX    = 0x0800,          // Linux family
+    ACE_OS_FREEBSD  = 0x1000,          // FreeBSD family
+    ACE_OS_IRIX     = 0x2000,          // SGI IRIX family
+    ACE_OS_OPENBSD  = 0x4000           // OpenBSD familty
   };
 
   enum Opcode {