ChangeLogTag: Mon Apr 12 12:54:37 2004 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 36 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 42f4bc91a90..0bcc32e2f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Apr 12 12:54:37 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-win32-common.h:
+
+          Only define ACE_HAS_WINSOCK2_GQOS if ACE_HAS_QOS is defined.
+
+        * bin/MakeProjectCreator/config/qos.mpb:
+
+          If the qos feature is enabled, add ACE_HAS_QOS to the macros.
+
 Mon Apr 12 13:51:42 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ace.mpc:
@@ -14,46 +24,46 @@ Mon Apr 12 13:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Thu Apr  1 15:40:55 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-	* ace/Strategies_T.cpp (activate_svc_handler): Make sure to
-	  store/restore errno when calling svc_handler->destroy ().
-  	  Thanks to Ewald Dieterich <ewald.dieterich@fun.de> for reporting
- 	  this.  This fixes bugid 1776.
+        * ace/Strategies_T.cpp (activate_svc_handler): Make sure to
+          store/restore errno when calling svc_handler->destroy ().
+          Thanks to Ewald Dieterich <ewald.dieterich@fun.de> for reporting
+          this.  This fixes bugid 1776.
 
 Sun Apr 11 18:33:35 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* */*.icc:
+        * */*.icc:
 
-	  Axed them from the repo. Thanks to Johnny for reminding me to do
-	  this.
+          Axed them from the repo. Thanks to Johnny for reminding me to do
+          this.
 
 Sun Apr 11 18:22:39 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* apps/JAWS2/HTTPU/HTTPU.DSP:
-	* java/gjt/GJT.DSP:
-	* java/src/JACE.DSP:
+        * apps/JAWS2/HTTPU/HTTPU.DSP:
+        * java/gjt/GJT.DSP:
+        * java/src/JACE.DSP:
 
-	  Axed them from the repo.
+          Axed them from the repo.
 
 Sun Apr 11 18:19:55 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* apps/JAWS2/HTTPU/HTTPU.DSW:
-	* java/gjt/GJT.DSW:
-	* java/src/JACE.DSW:
+        * apps/JAWS2/HTTPU/HTTPU.DSW:
+        * java/gjt/GJT.DSW:
+        * java/src/JACE.DSW:
 
-	  Removed these.
+          Removed these.
 
 Sat Apr 10 23:39:54 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* */*.ds[p,w]:
+        * */*.ds[p,w]:
 
-	  Removed.
+          Removed.
 
 Thu Apr  8 20:12:30 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* */*.bor:
+        * */*.bor:
 
-	  Removed all the borland makefiles files from the
-	  repository. Files in include/makeinclude have not been removed.
+          Removed all the borland makefiles files from the
+          repository. Files in include/makeinclude have not been removed.
 
 Thu Apr  8 08:03:13 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index e07e812336d..954b5b3bbcc 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -540,9 +540,9 @@ typedef unsigned long long ACE_UINT64;
 # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH
 #endif /* ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION */
 
-// Try to make a good guess whether we are compiling with the newer version
-// of WinSock 2 that has GQOS support.
-#if !defined (ACE_HAS_WINSOCK2_GQOS)
+// ACE_HAS_QOS is defined in the qos.mpb base project.
+// If qos=1 in default.features, then this macro will be defined.
+#if defined (ACE_HAS_QOS) && !defined (ACE_HAS_WINSOCK2_GQOS)
 # if defined (WINSOCK_VERSION)
 #  define ACE_HAS_WINSOCK2_GQOS 1
 # endif /* WINSOCK_VERSION */
diff --git a/bin/MakeProjectCreator/config/qos.mpb b/bin/MakeProjectCreator/config/qos.mpb
index 4add5aad5ee..5e938dd3e6f 100644
--- a/bin/MakeProjectCreator/config/qos.mpb
+++ b/bin/MakeProjectCreator/config/qos.mpb
@@ -2,9 +2,7 @@
 // $Id$
 
 feature(qos) {
-  after    += QoS
-  libs     += ACE_QoS
-  specific(borland, bmake, nmake, em3, vc6, vc7, vc71) {
-    macros += ACE_HAS_WINSOCK2_GQOS
-  }
+  after  += QoS
+  libs   += ACE_QoS
+  macros += ACE_HAS_QOS
 }