Supporess worning to allow YAJL2 to use long long in API

5 files changed, 22 insertions, 16 deletions

diff --git a/src/raptor_grddl.c b/src/raptor_grddl.c
index cf7bcdc4..01dfb78f 100644
--- a/src/raptor_grddl.c
+++ b/src/raptor_grddl.c
@@ -204,10 +204,10 @@ raptor_grddl_xsltGenericError_handler(void *user_data, const char *msg, ...)
       nmsg[length-1] = '\0';
   }
 
-  IGNORE_FORMAT_NONLITERAL_START
+  PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
   raptor_parser_log_error_varargs(rdf_parser, RAPTOR_LOG_LEVEL_ERROR,
                                   nmsg ? nmsg : msg, arguments);
-  IGNORE_FORMAT_NONLITERAL_END
+  PRAGMA_IGNORE_WARNING_END
 
   if(nmsg)
     RAPTOR_FREE(char*, nmsg);
diff --git a/src/raptor_internal.h b/src/raptor_internal.h
index d80e660c..3767c66a 100644
--- a/src/raptor_internal.h
+++ b/src/raptor_internal.h
@@ -176,14 +176,18 @@ void raptor_sign_free(void *ptr);
  * Valid for clang or GCC >= 4.9.0
  */
 #if defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((4) << 16) + (9)))
-#define IGNORE_FORMAT_NONLITERAL_START \
+#define PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START \
   _Pragma ("GCC diagnostic push") \
   _Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"")
-#define IGNORE_FORMAT_NONLITERAL_END \
+#define PRAGMA_IGNORE_WARNING_LONG_LONG_START \
+  _Pragma ("GCC diagnostic push") \
+  _Pragma ("GCC diagnostic ignored \"-Wlong-long\"")
+#define PRAGMA_IGNORE_WARNING_END \
   _Pragma ("GCC diagnostic pop")
 #else
-#define IGNORE_FORMAT_NONLITERAL_START
-#define IGNORE_FORMAT_NONLITERAL_END
+#define PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
+#define PRAGMA_IGNORE_WARNING_LONG_LONG_STAR
+#define PRAGMA_IGNORE_WARNING_END
 #endif
 
 
diff --git a/src/raptor_json.c b/src/raptor_json.c
index cee4f6ef..6032c8a9 100644
--- a/src/raptor_json.c
+++ b/src/raptor_json.c
@@ -237,6 +237,7 @@ static int raptor_json_yajl_boolean(void * ctx, int b)
 #else
 #define YAJL_INTEGER_CALLBACK_ARG_TYPE long
 #endif
+PRAGMA_IGNORE_WARNING_LONG_LONG_START
 static int raptor_json_yajl_integer(void * ctx,
                                     YAJL_INTEGER_CALLBACK_ARG_TYPE integerVal)
 {
@@ -244,6 +245,7 @@ static int raptor_json_yajl_integer(void * ctx,
   raptor_parser_error(rdf_parser, "Integers are not valid in RDF/JSON");
   return 0;
 }
+PRAGMA_IGNORE_WARNING_END
 
 static int raptor_json_yajl_double(void * ctx, double d)
 {
diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c
index 15698df5..538c2c8e 100644
--- a/src/raptor_libxml.c
+++ b/src/raptor_libxml.c
@@ -379,13 +379,13 @@ raptor_libxml_warning(void* user_data, const char *msg, ...)
       nmsg[length-2]='\0';
   }
   
-  IGNORE_FORMAT_NONLITERAL_START
+  PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
   raptor_log_error_varargs(sax2->world,
                            RAPTOR_LOG_LEVEL_WARN,
                            sax2->locator, 
                            nmsg ? nmsg : msg, 
                            args);
-  IGNORE_FORMAT_NONLITERAL_END
+  PRAGMA_IGNORE_WARNING_END
 
   if(nmsg)
     RAPTOR_FREE(char*, nmsg);
@@ -437,13 +437,13 @@ raptor_libxml_error_common(void* user_data, const char *msg, va_list args,
 
   l = (is_fatal) ? RAPTOR_LOG_LEVEL_FATAL: RAPTOR_LOG_LEVEL_ERROR;
 
-  IGNORE_FORMAT_NONLITERAL_START
+  PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
   raptor_log_error_varargs(world,
                            l,
                            locator,
                            nmsg ? nmsg : msg,
                            args);
-  IGNORE_FORMAT_NONLITERAL_END
+  PRAGMA_IGNORE_WARNING_END
   
   if(nmsg)
     RAPTOR_FREE(char*, nmsg);
@@ -485,12 +485,12 @@ raptor_libxml_generic_error(void* user_data, const char *msg, ...)
       nmsg[length-1]='\0';
   }
 
-  IGNORE_FORMAT_NONLITERAL_START
+  PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
   raptor_log_error_varargs(world, RAPTOR_LOG_LEVEL_ERROR,
                            /* locator */ NULL,
                            nmsg ? nmsg : msg, 
                            args);
-  IGNORE_FORMAT_NONLITERAL_END
+  PRAGMA_IGNORE_WARNING_END
   
   if(nmsg)
     RAPTOR_FREE(char*, nmsg);
@@ -546,13 +546,13 @@ raptor_libxml_validation_warning(void* user_data, const char *msg, ...)
       nmsg[length-2]='\0';
   }
 
-  IGNORE_FORMAT_NONLITERAL_START
+  PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
   raptor_log_error_varargs(sax2->world,
                            RAPTOR_LOG_LEVEL_WARN,
                            sax2->locator, 
                            nmsg ? nmsg : msg, 
                            args);
-  IGNORE_FORMAT_NONLITERAL_END
+  PRAGMA_IGNORE_WARNING_END
 
   if(nmsg)
     RAPTOR_FREE(char*, nmsg);
diff --git a/src/snprintf.c b/src/snprintf.c
index 0106c450..9d79d0cc 100644
--- a/src/snprintf.c
+++ b/src/snprintf.c
@@ -435,10 +435,10 @@ main(int argc, char *argv[])
       /* len_ref = sprintf(buf_ref, fmt, arg);
          assert((size_t)len_ref == x + y - 2); */
 
-      IGNORE_FORMAT_NONLITERAL_START
+      PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
       if(test_snprintf(len_ref, fmt, arg))
         errors++;
-      IGNORE_FORMAT_NONLITERAL_END
+      PRAGMA_IGNORE_WARNING_END
     }
   }