certi CMakeLists.txt include/certi.hh libCERTI/...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Mathé <jmm>    08/02/14 15:49:40

Modified files:
        .              : CMakeLists.txt 
        include        : certi.hh 
        libCERTI       : MessageBuffer.hh 

Log message:
        Update for Win32 compilation after first set of heterogeneity patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.25&r2=3.26
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/MessageBuffer.hh?cvsroot=certi&r1=3.1&r2=3.2

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- CMakeLists.txt      14 Feb 2008 12:32:24 -0000      1.33
+++ CMakeLists.txt      14 Feb 2008 15:49:40 -0000      1.34
@@ -81,7 +81,7 @@
 SET(PACKAGE_NAME      "CERTI")
 SET(PACKAGE_VERSION_MAJOR "3")
 SET(PACKAGE_VERSION_MINOR "2")
-SET(PACKAGE_VERSION_PATCH "6pre1")
+SET(PACKAGE_VERSION_PATCH "6pre2")
 SET(PACKAGE_VERSION   
"${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 # Autotools compatibility var
 SET(VERSION ${PACKAGE_VERSION})

Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.25
retrieving revision 3.26
diff -u -b -r3.25 -r3.26
--- include/certi.hh    14 Feb 2008 15:29:58 -0000      3.25
+++ include/certi.hh    14 Feb 2008 15:49:40 -0000      3.26
@@ -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.25 2008/02/14 15:29:58 erk Exp $
+// $Id: certi.hh,v 3.26 2008/02/14 15:49:40 jmm Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_HH_INCLUDED
@@ -56,6 +56,9 @@
            #define  CERTI_INT64_CONSTANT(val)  (val##LL)
            #define  CERTI_INT64_FORMAT         "ll"
         #endif
+        #ifndef __func__
+        #define __func__ "<unknown>"
+        #endif
     #else
        #ifdef __x86_64__
           #define  CERTI_INT64_CONSTANT(val)  (val##L)
@@ -380,4 +383,4 @@
        (uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
 #endif // CERTI_HH_INCLUDED
 
-// $Id: certi.hh,v 3.25 2008/02/14 15:29:58 erk Exp $
+// $Id: certi.hh,v 3.26 2008/02/14 15:49:40 jmm Exp $

Index: libCERTI/MessageBuffer.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/MessageBuffer.hh,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -b -r3.1 -r3.2
--- libCERTI/MessageBuffer.hh   14 Feb 2008 15:29:58 -0000      3.1
+++ libCERTI/MessageBuffer.hh   14 Feb 2008 15:49:40 -0000      3.2
@@ -39,7 +39,7 @@
  * One must read from the buffer in the exact order the write was done.
  * MessageBuffer is dynamically sized.
  */
-class MessageBuffer
+class CERTI_EXPORT MessageBuffer
 {
 public:
   /**
@@ -98,12 +98,12 @@
 #define DECLARE_SIGNED(type)                           \
   int32_t                                              \
   write_##type##s(const type##_t* data, uint32_t n) {          \
-    write_u##type##s(reinterpret_cast<const u##type##_t*>(data),n);    \
+    return write_u##type##s(reinterpret_cast<const u##type##_t*>(data),n);     
\
   }                                                    \
                                                        \
   int32_t                                              \
   read_##type##s(type##_t* data, uint32_t n) {         \
-    read_u##type##s(reinterpret_cast<u##type##_t*>(data),n);   \
+    return read_u##type##s(reinterpret_cast<u##type##_t*>(data),n);    \
   }                                                    \
     
 #define DECLARE_SINGLE_READ_WRITE(type,suffix)     \
@@ -114,7 +114,7 @@
                                                        \
   int32_t                                              \
   read_##type(type##suffix* data) {            \
-    read_##type##s(data,1);    \
+    return read_##type##s(data,1);     \
   }        
       
   int32_t