activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r498776 - /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
Date Mon, 22 Jan 2007 20:10:54 GMT
Author: nmittler
Date: Mon Jan 22 12:10:53 2007
New Revision: 498776

URL: http://svn.apache.org/viewvc?view=rev&rev=498776
Log:
[AMQCPP-40] - fix for redefinition of HAVE_WINSOCK2_H warning in msvc

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h?view=diff&rev=498776&r1=498775&r2=498776
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h Mon
Jan 22 12:10:53 2007
@@ -34,17 +34,37 @@
 	// of Windows or OS X to do this build
     
 	#if defined(_WIN32)
-		#define HAVE_OBJBASE_H
-		#define HAVE_RPCDCE_H
-		#define HAVE_WINSOCK2_H
-        #define HAVE_STRUCT_ADDRINFO
-        #define HAVE_SYS_TIMEB_H
-        #define HAVE_FTIME
-        #define HAVE_WINDOWS_H
+        #ifndef HAVE_OBJBASE_H
+		    #define HAVE_OBJBASE_H
+        #endif
+        #ifndef HAVE_RPCDCE_H
+		    #define HAVE_RPCDCE_H
+        #endif
+        #ifndef HAVE_WINSOCK2_H
+		    #define HAVE_WINSOCK2_H
+        #endif
+        #ifndef HAVE_STRUCT_ADDRINFO
+            #define HAVE_STRUCT_ADDRINFO
+        #endif
+        #ifndef HAVE_SYS_TIMEB_H
+            #define HAVE_SYS_TIMEB_H
+        #endif
+        #ifndef HAVE_FTIME
+            #define HAVE_FTIME
+        #endif
+        #ifndef HAVE_WINDOWS_H
+            #define HAVE_WINDOWS_H
+        #endif
 	#else
-		#define HAVE_UUID_UUID_H
-        #define HAVE_UUID_T
-        #define HAVE_PTHREAD_H
+        #ifndef HAVE_UUID_UUID_H
+		    #define HAVE_UUID_UUID_H
+        #endif
+        #ifndef HAVE_UUID_T
+            #define HAVE_UUID_T
+        #endif
+        #ifndef HAVE_PTHREAD_H
+            #define HAVE_PTHREAD_H
+        #endif
 	#endif
 
 #endif /* !defined(HAVE_CONFIG_H) */



Mime
View raw message