c++ ready

diff --git a/libtrbnet/trberror.h b/libtrbnet/trberror.h
index de40459f7e1768acb31a0f7c16429afc575bad2c..5f1dc3580be524d8de53ed3f15b7c0722f8f2e8a 100644 (file)
--- a/libtrbnet/trberror.h
+++ b/libtrbnet/trberror.h
@@ -3,6 +3,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
   TRB_NONE = 0,
   TRB_TX_BUSY = 1,
@@ -52,4 +56,8 @@ extern TRB_TERM trb_term;
 
 const char* trb_strterm(TRB_TERM term);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c
index 66ffcce0b0b2f36fb815a4a8da585e0665cfa760..01b5c4b37d73683625c89bc9799c11a50d89a721 100644 (file)
--- a/libtrbnet/trbnet.c
+++ b/libtrbnet/trbnet.c
@@ -1,4 +1,4 @@
-const char trbnet_version[] = "$Revision: 2.60 $";
+const char trbnet_version[] = "$Revision: 2.61 $";
 
 #include <stdlib.h>
 #include <signal.h>
@@ -1034,12 +1034,12 @@ int init_ports()
     return -1;
   }
   
-  mem = mmap((void*)0,
-             2 * 4 * 4 * 8192,
-             PROT_READ | PROT_WRITE,
-             MAP_SHARED,
-             memfd,
-             0xb0000000);
+  mem = (uint32_t*)mmap((void*)0,
+                   2 * 4 * 4 * 8192,
+                   PROT_READ | PROT_WRITE,
+                   MAP_SHARED,
+                   memfd,
+                   0xb0000000);
   
   if ((void*)mem == MAP_FAILED) {
     trb_errno = TRB_FIFO_SHARED_MEM;

diff --git a/libtrbnet/trbnet.h b/libtrbnet/trbnet.h
index 82062aa0d087914409aa6f6f7c21a06cade687c8..afa1c06dbd2e4e7a2ca321cafe4d0fd7e9edacdc 100644 (file)
--- a/libtrbnet/trbnet.h
+++ b/libtrbnet/trbnet.h
@@ -10,6 +10,10 @@ extern unsigned int trb_debug;
 extern unsigned int trb_dma;
 extern FILE* trb_stderr;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ---------------------------------------------------------------------- */
 
 int init_ports();
@@ -233,5 +237,8 @@ int com_reset();
                        uint16_t number);
 */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif