[certi-cvs] certi include/certi.hh libHLA/libhla.hh

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/21 18:31:52

Modified files:
        include        : certi.hh 
        libHLA         : libhla.hh 

Log message:
        Avoid multiple define with MSVC

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.47&r2=3.48
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/libhla.hh?cvsroot=certi&r1=1.2&r2=1.3

Patches:
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -b -r3.47 -r3.48
--- include/certi.hh    20 Mar 2010 17:30:37 -0000      3.47
+++ include/certi.hh    21 Mar 2010 18:31:52 -0000      3.48
@@ -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.47 2010/03/20 17:30:37 gotthardp Exp $
+// $Id: certi.hh,v 3.48 2010/03/21 18:31:52 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_HH_INCLUDED
@@ -27,6 +27,8 @@
     #ifdef _MSC_VER
         // Visual C++ does not support declarations using exceptions 
specification
         #pragma warning(disable: 4290)
+               #ifndef FAKED_INTTYPES_DEFINED
+               #define FAKED_INTTYPES_DEFINED
         typedef unsigned __int64        uint64_t;
         typedef __int64                         int64_t;
         typedef unsigned __int32       uint32_t;
@@ -35,6 +37,7 @@
         typedef __int16                         int16_t;
         typedef unsigned __int8                 uint8_t;
         typedef __int8                   int8_t;
+        #endif
         #ifdef _M_X64
            #define  CERTI_INT64_CONSTANT(val)  (val##L)
            #define  CERTI_INT64_FORMAT         "l"
@@ -301,4 +304,4 @@
        (uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
 #endif // CERTI_HH_INCLUDED
 
-// $Id: certi.hh,v 3.47 2010/03/20 17:30:37 gotthardp Exp $
+// $Id: certi.hh,v 3.48 2010/03/21 18:31:52 erk Exp $

Index: libHLA/libhla.hh
===================================================================
RCS file: /sources/certi/certi/libHLA/libhla.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libHLA/libhla.hh    21 Mar 2010 17:14:52 -0000      1.2
+++ libHLA/libhla.hh    21 Mar 2010 18:31:52 -0000      1.3
@@ -16,13 +16,15 @@
 // 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: libhla.hh,v 1.2 2010/03/21 17:14:52 erk Exp $
+// $Id: libhla.hh,v 1.3 2010/03/21 18:31:52 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef LIBHLA_HH_INCLUDED
 #define LIBHLA_HH_INCLUDED
 
 #ifdef _MSC_VER
+#ifndef FAKED_INTTYPES_DEFINED
+#define FAKED_INTTYPES_DEFINED
 typedef unsigned __int64  uint64_t;
 typedef signed __int64    int64_t;
 typedef unsigned __int32  uint32_t;
@@ -32,6 +34,7 @@
 typedef unsigned __int8   uint8_t;
 typedef signed __int8     int8_t;
 typedef short int         int_least16_t;
+#endif
 #else
 #include <inttypes.h>
 #endif