[mapguide-commits] r9343 - in trunk/MgDev: . Oem/ACE/ACE_wrappers/ace

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-03 05:06:04 -0800 (Sat, 03 Mar 2018)
New Revision: 9343

Modified:
   trunk/MgDev/
   trunk/MgDev/Oem/ACE/ACE_wrappers/ace/config-win32.h
Log:
Merged revision(s) 9146 from sandbox/adsk/3.2o.AIMS:
Enable ACE IPv6 support.
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2018-03-03 13:04:01 UTC (rev 9342)
+++ trunk/MgDev	2018-03-03 13:06:04 UTC (rev 9343)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -6,7 +6,7 ##
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
 /sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
-/sandbox/adsk/3.2o.AIMS:9135-9140
+/sandbox/adsk/3.2o.AIMS:9135-9140,9146
 /sandbox/jng/clean_json:8818-9180
 /sandbox/jng/cmake_v2:9259-9317
 /sandbox/jng/cmdline:9199-9217
Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/ace/config-win32.h
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/ace/config-win32.h	2018-03-03 13:04:01 UTC (rev 9342)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/ace/config-win32.h	2018-03-03 13:06:04 UTC (rev 9343)
@@ -19,6 +19,9 @@
 #define ACE_CONFIG_WIN32_H
 #include /**/ "ace/pre.h"
 
+#define ACE_HAS_IPV6
+#define ACE_USES_IPV4_IPV6_MIGRATION
+
 // NOTE: Please do not add anything besides #include's here.  Put other stuff
 //       (definitions, etc.) in the included headers