certi libCERTI/fed.cc libCERTI/RootObject.hh te...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      07/11/19 14:07:05

Modified files:
        libCERTI       : fed.cc RootObject.hh 
        test/libgraphc : CMakeLists.txt 
        include        : certi.hh 

Log message:
        late patch for CERTI 3.2.5 on windows + MSVC

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/fed.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/RootObject.hh?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/test/libgraphc/CMakeLists.txt?cvsroot=certi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.19&r2=3.20

Patches:
Index: libCERTI/fed.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/fed.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/fed.cc     16 Nov 2007 15:04:22 -0000      3.13
+++ libCERTI/fed.cc     19 Nov 2007 14:07:04 -0000      3.14
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: fed.cc,v 3.13 2007/11/16 15:04:22 rousse Exp $
+// $Id: fed.cc,v 3.14 2007/11/19 14:07:04 erk Exp $
 // ----------------------------------------------------------------------------
 
 // CERTI header
@@ -103,9 +103,11 @@
     federate = "" ;
     attribute = 0 ;
     parameter = 0 ;
+    #ifndef _WIN32 
    /* we may need to restart parsing after previous parse error */
     rewind(yyin);
     yyrestart(yyin);
+    #endif
     int result = yyparse();   
     fclose(file);
     return result ;
@@ -397,4 +399,4 @@
 
 }} // namespaces
 
-// $Id: fed.cc,v 3.13 2007/11/16 15:04:22 rousse Exp $
+// $Id: fed.cc,v 3.14 2007/11/19 14:07:04 erk Exp $

Index: libCERTI/RootObject.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/RootObject.hh,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- libCERTI/RootObject.hh      19 Nov 2007 09:29:04 -0000      3.24
+++ libCERTI/RootObject.hh      19 Nov 2007 14:07:04 -0000      3.25
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RootObject.hh,v 3.24 2007/11/19 09:29:04 erk Exp $
+// $Id: RootObject.hh,v 3.25 2007/11/19 14:07:04 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef LIBCERTI_ROOT_OBJECT
@@ -42,6 +42,7 @@
 #include "certi.hh"
 #include "SecurityServer.hh"
 #include "HandleManager.hh"
+#include "RoutingSpace.hh"
 
 #include <vector>
 
@@ -118,4 +119,4 @@
 
 #endif // LIBCERTI_ROOT_OBJECT
 
-// $Id: RootObject.hh,v 3.24 2007/11/19 09:29:04 erk Exp $
+// $Id: RootObject.hh,v 3.25 2007/11/19 14:07:04 erk Exp $

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

Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- include/certi.hh    19 Nov 2007 10:28:57 -0000      3.19
+++ include/certi.hh    19 Nov 2007 14:07:04 -0000      3.20
@@ -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.19 2007/11/19 10:28:57 erk Exp $
+// $Id: certi.hh,v 3.20 2007/11/19 14:07:04 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_HH_INCLUDED
@@ -40,6 +40,12 @@
        #endif  
     typedef u_long             in_addr_t;
     typedef unsigned short     in_port_t;
+    typedef unsigned __int32   uint32_t;
+    typedef __int32                            int32_t;
+    typedef unsigned __int16   uint16_t;
+    typedef __int16                            int16_t;
+    typedef unsigned __int8    uint8_t;
+    typedef __int8                             int8_t;
 #else
        #define STAT_FUNCTION           stat
        #define STAT_STRUCT                     struct stat
@@ -320,4 +326,4 @@
 
 #endif // CERTI_HH_INCLUDED
 
-// $Id: certi.hh,v 3.19 2007/11/19 10:28:57 erk Exp $
+// $Id: certi.hh,v 3.20 2007/11/19 14:07:04 erk Exp $