certi libCERTI/SocketTCP.hh libCERTI/Socket.hh ...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      07/11/19 10:04:33

Modified files:
        libCERTI       : SocketTCP.hh Socket.hh 
        include        : certi.hh 
        libRTI         : CMakeLists.txt 
        test/libgraphc : CMakeLists.txt 
        .              : CMakeLists.txt 

Log message:
        Windows + MinGW update

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.hh?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Socket.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/certi/test/libgraphc/CMakeLists.txt?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.25&r2=1.26

Patches:
Index: libCERTI/SocketTCP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.hh,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/SocketTCP.hh       22 Oct 2007 14:25:53 -0000      3.15
+++ libCERTI/SocketTCP.hh       19 Nov 2007 10:04:33 -0000      3.16
@@ -23,13 +23,7 @@
 #include "Socket.hh"
 #include "certi.hh"
 
-#ifdef _WIN32
-       #ifndef _WINSOCK2API_
-               #ifndef _WINSOCKAPI_
-                       #include <winsock2.h>
-               #endif
-       #endif  
-#else
+#ifndef _WIN32
        #include <sys/socket.h>
        #include <netinet/in.h>
 #endif

Index: libCERTI/Socket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Socket.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/Socket.hh  22 Oct 2007 14:25:53 -0000      3.11
+++ libCERTI/Socket.hh  19 Nov 2007 10:04:33 -0000      3.12
@@ -21,13 +21,7 @@
 #define CERTI_SOCKET_HH
 
 #include "certi.hh"
-       #ifdef _WIN32
-       #ifndef _WINSOCK2API_
-               #ifndef _WINSOCKAPI_
-                       #include <winsock2.h>
-               #endif
-       #endif
-#else
+#ifndef _WIN32
        #include <sys/time.h>
        #include <sys/types.h>
        #include <netinet/in.h>

Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- include/certi.hh    25 Sep 2007 13:25:31 -0000      3.17
+++ include/certi.hh    19 Nov 2007 10:04:33 -0000      3.18
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: certi.hh,v 3.17 2007/09/25 13:25:31 erk Exp $
+// $Id: certi.hh,v 3.18 2007/11/19 10:04:33 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_HH_INCLUDED
@@ -32,6 +32,14 @@
        #define  strcasecmp                     strcmp
        #define STAT_FUNCTION           _stat
        #define STAT_STRUCT                     struct _stat            
+       /* TCP/IP related typedef and includes */
+    #ifndef _WINSOCK2API_
+               #ifndef _WINSOCKAPI_
+                       #include <winsock2.h>             
+               #endif    
+       #endif  
+    typedef u_long             in_addr_t;
+    typedef unsigned short     in_port_t;
 #else
        #define STAT_FUNCTION           stat
        #define STAT_STRUCT                     struct stat
@@ -312,4 +320,4 @@
 
 #endif // CERTI_HH_INCLUDED
 
-// $Id: certi.hh,v 3.17 2007/09/25 13:25:31 erk Exp $
+// $Id: certi.hh,v 3.18 2007/11/19 10:04:33 erk Exp $

Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libRTI/CMakeLists.txt       26 Sep 2007 14:15:21 -0000      1.6
+++ libRTI/CMakeLists.txt       19 Nov 2007 10:04:33 -0000      1.7
@@ -23,7 +23,7 @@
 SET_TARGET_PROPERTIES(RTI PROPERTIES VERSION 1.0.0 SOVERSION 1)
 IF (MINGW)
     SET_TARGET_PROPERTIES(RTI PROPERTIES LINK_FLAGS 
"-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libRTI.def")
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libRTI.def
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/RTI.def
             DESTINATION lib)
 ENDIF (MINGW)
 

Index: test/libgraphc/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/libgraphc/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/libgraphc/CMakeLists.txt       6 Jul 2007 14:20:41 -0000       1.4
+++ test/libgraphc/CMakeLists.txt       19 Nov 2007 10:04:33 -0000      1.5
@@ -1,6 +1,11 @@
 
 # FIXME I do not remember why this should be static?
-ADD_LIBRARY(graph STATIC graph_c.cc)
+# on non WINDOWS platform
+IF (WIN32)
+    ADD_LIBRARY(graph graph_c.cc)
+ELSE(WIN32)
+    ADD_LIBRARY(graph STATIC graph_c.cc)
+ENDIF(WIN32)
 
 INSTALL(TARGETS graph
     RUNTIME DESTINATION bin

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- CMakeLists.txt      24 Oct 2007 07:36:29 -0000      1.25
+++ CMakeLists.txt      19 Nov 2007 10:04:33 -0000      1.26
@@ -34,6 +34,10 @@
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 IF (WIN32)
+    IF (MINGW)
+        SET(CMAKE_SHARED_LIBRARY_PREFIX "")
+        SET(CMAKE_STATIC_LIBRARY_PREFIX "")
+    ENDIF (MINGW)
        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
        SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
 ENDIF(WIN32)