Fix cpprofiler compilation on Windows

Author: zayenz

CMakeLists.txt

@@ -553,6 +553,9 @@ endif()
 gecode_link_component(kernel support)
 if(GECODE_ENABLE_SEARCH)
   gecode_link_component(search kernel)
+  if(WIN32 AND GECODE_ENABLE_CPPROFILER)
+    gecode_link_component(search ws2_32)
+  endif()
 endif()
 if(GECODE_ENABLE_INT_VARS)
   gecode_link_component(int kernel)

Makefile.in

@@ -75,6 +75,7 @@ export EXAMPLES_EXTRA_CXXFLAGS = @EXAMPLES_EXTRA_CXXFLAGS@
 
 export QT_CPPFLAGS = @QTDEFINES@ @QTINCLUDES@
 export LINKQT = @QTLIBS@
+export LINKCPPROFILER = @LINKCPPROFILER@
 export MPFR_CPPFLAGS = @GMP_CPPFLAGS@ @MPFR_CPPFLAGS@
 ifeq "@enable_mpfr@" "yes"
 export LINKMPFR = @MPFR_LIB_PATH@ @GMP_LIB_PATH@ @MPFR_LINK@ @GMP_LINK@
@@ -1545,7 +1546,7 @@ $(KERNELDLL): $(KERNELOBJ) $(SUPPORTDLL)
 	$(CREATELINK) $@ $(@:%$(DLLSUFFIX)=%$(SOSUFFIX))
 $(SEARCHDLL): $(SEARCHOBJ) $(SUPPORTDLL) $(KERNELDLL)
 	$(CXX) $(DLLFLAGS) $(SEARCHOBJ) $(SEARCHSONAME) \
-		@DLLPATH@ $(LINKSUPPORT) $(LINKKERNEL) \
+		@DLLPATH@ $(LINKSUPPORT) $(LINKKERNEL) $(LINKCPPROFILER) \
 		@LINKOUTPUT@$(SEARCHDLL)
 	$(CREATELINK) $@ $(@:%$(DLLSUFFIX)=%$(SOLINKSUFFIX))
 	$(CREATELINK) $@ $(@:%$(DLLSUFFIX)=%$(SOSUFFIX))
@@ -1622,7 +1623,7 @@ $(SEARCHRC):
 endif
 $(SEARCHDLL) $(SEARCHLIB): $(SEARCHOBJ) $(SEARCHRES) $(SUPPORTDLL) $(KERNELDLL)
 	$(CXX) $(DLLFLAGS) $(SEARCHOBJ) $(SEARCHRES) \
-		@DLLPATH@ @LINKOUTPUT@$(SEARCHDLL) $(GLDFLAGS)
+		@DLLPATH@ @LINKOUTPUT@$(SEARCHDLL) $(GLDFLAGS) $(LINKCPPROFILER)
 	$(FIXMANIFEST) $(SEARCHDLL).manifest
 	$(MANIFEST) -manifest $(SEARCHDLL).manifest \
 		    -outputresource:$(SEARCHDLL)\;2
@@ -1781,13 +1782,13 @@ examples/%$(EXESUFFIX): examples/%$(OBJSUFFIX) examples/%$(EXESUFFIX).res \
 	$(ALLLIB)
 	$(CXX) @EXEOUTPUT@$@ $< $@.res \
 		$(DLLPATH) $(CXXFLAGS) \
-		$(LINKALL) $(GLDFLAGS) $(LINKQT)
+		$(LINKALL) $(GLDFLAGS) $(LINKQT) $(LINKCPPROFILER)
 	$(FIXMANIFEST) $@.manifest
 	$(MANIFEST) -manifest $@.manifest -outputresource:$@\;1
 else
 examples/%$(EXESUFFIX): examples/%$(OBJSUFFIX) $(ALLLIB)
 	$(CXX) @EXEOUTPUT@$@ $< $(DLLPATH) $(CXXFLAGS) \
-	$(LINKALL) $(GLDFLAGS) $(LINKQT)
+	$(LINKALL) $(GLDFLAGS) $(LINKQT) $(LINKCPPROFILER)
 	$(FIXMANIFEST) $@.manifest
 	$(MANIFEST) -manifest $@.manifest -outputresource:$@\;1
 endif
@@ -1801,7 +1802,7 @@ TESTRES =
 endif
 $(TESTEXE): $(TESTOBJ) $(TESTRES) $(ALLLIB)
 	$(CXX) @EXEOUTPUT@$@ $(TESTOBJ) $(TESTRES) $(DLLPATH) $(CXXFLAGS) \
-	$(LINKALL) $(GLDFLAGS) $(LINKQT)
+	$(LINKALL) $(GLDFLAGS) $(LINKQT) $(LINKCPPROFILER)
 	$(FIXMANIFEST) $@.manifest $(DLLSUFFIX)
 	$(MANIFEST) -manifest $@.manifest -outputresource:$@\;1
 
@@ -1821,8 +1822,8 @@ FLATZINCEXERES =
 endif
 $(FLATZINCEXE): $(FLATZINCEXEOBJ) $(FLATZINCEXERES) $(ALLLIB)
 	$(CXX) @EXEOUTPUT@$@ $(FLATZINCEXEOBJ) $(FLATZINCEXERES) \
-	$(DLLPATH) $(CXXFLAGS) \
-	$(LINKALL) $(GLDFLAGS) $(LINKSTATICQT)
+		$(DLLPATH) $(CXXFLAGS) \
+	$(LINKALL) $(GLDFLAGS) $(LINKSTATICQT) $(LINKCPPROFILER)
 	$(FIXMANIFEST) $@.manifest
 	$(MANIFEST) -manifest $@.manifest -outputresource:$@\;1
 

configure

@@ -672,6 +672,7 @@ HAVEBISON
 HAVE_FLEXBISON
 HAVEFLEX
 enable_cpprofiler
+LINKCPPROFILER
 enable_cbs
 enable_gist
 enable_qt
@@ -13801,11 +13802,21 @@ then :
   enableval=$enable_cpprofiler;
 fi
 
+
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with support for CPProfiler" >&5
 printf %s "checking whether to build with support for CPProfiler... " >&6; }
   if test "${enable_cpprofiler:-yes}" = "yes"; then
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
+    if test "${host_os}" = "windows"; then
+      if test "${ac_cv_cxx_compiler_vendor}" = "microsoft"; then
+        LINKCPPROFILER=ws2_32.lib
+
+      else
+        LINKCPPROFILER=-lws2_32
+
+      fi
+    fi
     enable_cpprofiler=yes
 
 

gecode.m4

@@ -1399,9 +1399,17 @@ AC_DEFUN([AC_GECODE_CPPROFILER],
   AC_ARG_ENABLE([cpprofiler],
     AS_HELP_STRING([--enable-cpprofiler],
       [build with support for CPProfiler @<:@default=yes@:>@]))
+  AC_SUBST(LINKCPPROFILER, [])
   AC_MSG_CHECKING(whether to build with support for CPProfiler)
   if test "${enable_cpprofiler:-yes}" = "yes"; then
     AC_MSG_RESULT(yes)
+    if test "${host_os}" = "windows"; then
+      if test "${ac_cv_cxx_compiler_vendor}" = "microsoft"; then
+        AC_SUBST(LINKCPPROFILER, [ws2_32.lib])
+      else
+        AC_SUBST(LINKCPPROFILER, [-lws2_32])
+      fi
+    fi
     AC_SUBST(enable_cpprofiler, yes)
     AC_DEFINE([GECODE_HAS_CPPROFILER],[],[Whether CPProfiler support available])
   else

gecode/search/cpprofiler/connector.hpp

@@ -42,13 +42,15 @@
 #include <vector>
 #include <cstring>
 
-#ifdef WIN32
+#if defined(_WIN32)
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#if defined(_MSC_VER)
 #pragma comment(lib, "Ws2_32.lib")
 #pragma comment(lib, "Mswsock.lib")
 #pragma comment(lib, "AdvApi32.lib")
+#endif
 
 #include <basetsd.h>
 typedef SSIZE_T ssize_t;
@@ -270,7 +272,7 @@ namespace Gecode { namespace CPProfiler {
     struct addrinfo hints, *servinfo, *p;
     int rv;
 
-#ifdef WIN32
+#if defined(_WIN32)
     // Initialise Winsock.
     WSADATA wsaData;
     int startupResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
@@ -297,7 +299,7 @@ namespace Gecode { namespace CPProfiler {
       }
 
       if (::connect(sockfd, p->ai_addr, p->ai_addrlen) == -1) {
-#ifdef WIN32
+#if defined(_WIN32)
         closesocket(sockfd);
 #else
         close(sockfd);
@@ -378,7 +380,7 @@ namespace Gecode { namespace CPProfiler {
 
   inline void
   Connector::disconnect() {
-#ifdef WIN32
+#if defined(_WIN32)
     closesocket(sockfd);
 #else
     close(sockfd);