MonetDB: gdk_tracer - Compilation fixes

[Thodoris Zois]

Changeset: 600dcb9f4e0e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=600dcb9f4e0e
Modified Files:
        gdk/gdk_tracer.h
        gdk/gdk_utils.c
        sql/include/sql_mem.h
Branch: gdk_tracer
Log Message:

Compilation fixes


diffs (90 lines):

diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -39,7 +39,7 @@ typedef enum {
     FOREACH_ADPTR(GENERATE_ENUM)
 } ADAPTER;
 
-gdk_export const char *ADAPTER_STR[] = {
+static const char *ADAPTER_STR[] = {
     FOREACH_ADPTR(GENERATE_STRING)
 };
 
@@ -58,7 +58,7 @@ typedef enum {
     FOREACH_LEVEL(GENERATE_ENUM)
 } LOG_LEVEL;
 
-gdk_export const char *LEVEL_STR[] = {
+static const char *LEVEL_STR[] = {
     FOREACH_LEVEL(GENERATE_STRING)
 };
 
@@ -76,7 +76,7 @@ typedef enum {
     FOREACH_LAYER(GENERATE_ENUM)
 } LAYER;
 
-gdk_export const char *LAYER_STR[] = {
+static const char *LAYER_STR[] = {
     FOREACH_LAYER(GENERATE_STRING)
 };
 
@@ -87,7 +87,7 @@ gdk_export const char *LAYER_STR[] = {
         COMP( PAR )                   \
         COMP( ALGO )                  \
         COMP( DELTA )                 \
-        COMP( IO )                    \
+        COMP( IO_ )                   \
         COMP( TEM )                   \
                                       \
         COMP( GEOM )                  \
@@ -184,7 +184,7 @@ typedef enum {
     FOREACH_COMP(GENERATE_ENUM)
 } COMPONENT;
 
-gdk_export const char *COMPONENT_STR[] = {
+static const char *COMPONENT_STR[] = {
     FOREACH_COMP(GENERATE_STRING)
 };
 
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1474,7 +1474,7 @@ THRnew(const char *name, MT_Id pid)
        char *nme = GDKstrdup(name);
 
        if (nme == NULL) {
-               DEBUG(IO, "Malloc failure\n");
+               DEBUG(IO_, "Malloc failure\n");
                GDKerror("THRnew: malloc failure\n");
                return NULL;
        }
@@ -1496,7 +1496,7 @@ THRnew(const char *name, MT_Id pid)
                }
        }
        GDKfree(nme);
-       DEBUG(IO, "Too many threads\n");
+       DEBUG(IO_, "Too many threads\n");
        GDKerror("THRnew: too many threads\n");
        return NULL;
 }
@@ -1547,7 +1547,7 @@ THRcreate(void (*f) (void *), void *arg,
        };
        len = snprintf(semname, sizeof(semname), "THRcreate%" PRIu64, 
(uint64_t) ATOMIC_INC(&ctr));
        if (len == -1 || len > (int) sizeof(semname)) {
-               DEBUG(IO, "Semaphore name is too large\n");
+               DEBUG(IO_, "Semaphore name is too large\n");
                GDKerror("THRcreate: semaphore name is too large\n");
                GDKfree(t);
                GDKfree(s->name);
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -130,7 +130,7 @@ extern size_t sa_size( sql_allocator *sa
                size_t _l = (l);                                \
                char *_res = sa_strndup(_sa, _s, _l);           \
                DEBUG(ALLOC,                            \
-                               "sa_strndup(%p,len=%zu) -> %p\n"        \
+                               "sa_strndup(%p,len=%zu) -> %p\n",       \
                                _sa, _l, _res);         \
                _res;                                           \
        })
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list