Solve mac os warnings

diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h
index ae782329085eef99228deb5b78412f2467c9930b..1c1826f90dd84b0abb4bc901ae93d9eaae80cb92 100644 (file)
--- a/include/siri/grammar/gramp.h
+++ b/include/siri/grammar/gramp.h
@@ -26,8 +26,8 @@
 
 
 #if CLERI_VERSION_MINOR >= 12
-#define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->data)
-#define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->data)
+#define CLERI_NODE_DATA(__node) ((int64_t)(__node)->data)
+#define CLERI_NODE_DATA_ADDR(__node) ((int64_t *) &(__node)->data)
 #else
 #define CLERI_NODE_DATA(__node) (__node)->result
 #define CLERI_NODE_DATA_ADDR(__node) &(__node)->result

diff --git a/include/siri/siri.h b/include/siri/siri.h
index ec42665d8410802770104e75478e24b5988c7624..a029c279930b16559c993d5a7a887c2d885cfc5a 100644 (file)
--- a/include/siri/siri.h
+++ b/include/siri/siri.h
@@ -20,10 +20,10 @@
 #define MAX_NUMBER_DB 1024
 
 #if defined(__GLIBC__)
-#define strerror_s(__err, __buf, __sz) \
+#define strerror_si(__err, __buf, __sz) \
     strerror_r(__err, __buf, __sz)
 #else
-#define strerror_s(__err, __buf, __sz) \
+#define strerror_si(__err, __buf, __sz) \
     (strerror_r(__err, __buf, __sz) == 0 ? __buf : "unexpected error")
 #endif
 

diff --git a/src/siri/db/shard.c b/src/siri/db/shard.c
index cd89df90f0cdeef6c5ccd64202a83f31c8a0d5b3..87dbe11fe4d3864a7a74366235a0369617eb8b3e 100644 (file)
--- a/src/siri/db/shard.c
+++ b/src/siri/db/shard.c
@@ -335,7 +335,7 @@ siridb_shard_t *  siridb_shard_create(
     {
         char buf[1024];
         log_critical("Cannot create shard file: '%s' (%s)",
-                shard->fn, strerror_s(errno, buf, sizeof(buf)));
+                shard->fn, strerror_si(errno, buf, sizeof(buf)));
         siridb_shard_decref(shard);
         ERR_FILE
         return NULL;
@@ -359,7 +359,7 @@ siridb_shard_t *  siridb_shard_create(
     {
         char buf[1024];
         log_critical("Cannot write to shard file: '%s' (%s)",
-                shard->fn, strerror_s(errno, buf, sizeof(buf)));
+                shard->fn, strerror_si(errno, buf, sizeof(buf)));
         fclose(fp);
         siridb_shard_decref(shard);
         ERR_FILE
@@ -370,7 +370,7 @@ siridb_shard_t *  siridb_shard_create(
     {
         char buf[1024];
         log_critical("Cannot close shard file: '%s' (%s)",
-                shard->fn, strerror_s(errno, buf, sizeof(buf)));
+                shard->fn, strerror_si(errno, buf, sizeof(buf)));
         siridb_shard_decref(shard);
         ERR_FILE
         return NULL;