Minor updates for C++ compatibility.

diff --git a/ulut/Makefile.omk b/ulut/Makefile.omk
index 72c5c7f251a5fe2d0a3c0d582b207276fb80ab69..899dddc1dc413af519d29777b2385be26a03d9c2 100644 (file)
--- a/ulut/Makefile.omk
+++ b/ulut/Makefile.omk
@@ -5,11 +5,11 @@ default_CONFIG += CONFIG_OC_SOLIBS=x
 ifeq ($(CONFIG_OC_ULUT),y)
 
 include_HEADERS  = ul_dbuff.h ul_evcbase.h ul_gavl.h ul_gavlcust.h \
-               ul_gavlflesint.h ul_gavlrepcust.h ul_gsa.h ul_gsacust.h \
+              ul_gavlflesint.h ul_gavlrepcust.h ul_gsa.h ul_gsacust.h \
               ul_hptree.h ul_htimdefs.h ul_htimer.h ul_itbase.h \
               ul_list.h ul_listbase.h ul_utdefs.h ul_utmalloc.h \
               ul_uniqid.h ul_dbufflog.h ul_log.h ul_logbase.h \
-              ul_logreg.h
+              ul_logreg.h ul_cbuff.h
 
 lib_LIBRARIES = ulut
 
@@ -18,10 +18,10 @@ shared_LIBRARIES = ulut
 endif
 
 ulut_SOURCES = ul_dbufbase.c ul_dbufmore.c ul_gsa.c ul_gsacust.c \
-               ul_gavlprim.c ul_gavl.c ul_hptree.c \
-               ul_htimer.c ul_htimbase.c ul_htimmstime.c \
-               ul_evcbase.c ul_uniqid.c ul_dbufflog.c ul_logbase.c \
-              ul_logreg.c
+              ul_gavlprim.c ul_gavl.c ul_hptree.c \
+              ul_htimer.c ul_htimbase.c ul_htimmstime.c \
+              ul_evcbase.c ul_uniqid.c ul_dbufflog.c ul_logbase.c \
+              ul_logreg.c ul_cbuff.c
 
 lib_LOADLIBES = ulut
 

diff --git a/ulut/ul_dbufflog.h b/ulut/ul_dbufflog.h
index 256e031e05344872c363020345c100e8729ea574..5853904f97915b2282120e5b87726973cdfba269 100644 (file)
--- a/ulut/ul_dbufflog.h
+++ b/ulut/ul_dbufflog.h
@@ -3,6 +3,10 @@
 
 #include "ul_dbuff.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * ul_dbuff_log_hex - writes content of dbuff to log
  * @buf: buffer structure
@@ -10,5 +14,9 @@
  */
 void ul_dbuff_log_hex(ul_dbuff_t *buf, int log_level);
 
+#ifdef __cplusplus
+} /* extern "C"*/
+#endif
+
 #endif /* UL_DBUFFLOG_H */
 

diff --git a/ulut/ul_uniqid.h b/ulut/ul_uniqid.h
index 32de471c2f5eb1a1f264d83a8da4d099c8cc7c56..b9a6dfc116648417af0db2a22597886dc2767949 100644 (file)
--- a/ulut/ul_uniqid.h
+++ b/ulut/ul_uniqid.h
@@ -26,6 +26,9 @@
 
 #include "ul_gavl.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef unsigned long ul_uniqid_t;
 
@@ -61,5 +64,8 @@ int ul_uniqid_pool_alloc_one(ul_uniqid_pool_t *pool, ul_uniqid_t *ptrid);
 int ul_uniqid_pool_alloc_one_after(ul_uniqid_pool_t *pool, ul_uniqid_t *ptrid, ul_uniqid_t afterid);
 int ul_uniqid_pool_free_one(ul_uniqid_pool_t *pool, ul_uniqid_t id);
 
+#ifdef __cplusplus
+} /* extern "C"*/
+#endif
 
 #endif /*_UL_UNIQID_H*/