Add PRAGMA_IGNORE_WARNING_REDUNDANT_DECLS_OVERFLOW_START for timegm

dajobe · Sep 12, 2023 · 88b411a · 88b411a
1 parent 92e464a
commit 88b411a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/rasqal_internal.h b/src/rasqal_internal.h
@@ -193,12 +193,15 @@ void rasqal_system_free(void *ptr);
 #define PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START \
  _Pragma ("GCC diagnostic push") \
  _Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+#define PRAGMA_IGNORE_WARNING_FORMAT_OVERFLOW_START \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wformat-overflow\"")
 #define PRAGMA_IGNORE_WARNING_FORMAT_TRUNCATION_START \
  _Pragma ("GCC diagnostic push") \
  _Pragma ("GCC diagnostic ignored \"-Wformat-truncation\"")
-#define PRAGMA_IGNORE_WARNING_FORMAT_OVERFLOW_START  \
+#define PRAGMA_IGNORE_WARNING_REDUNDANT_DECLS_OVERFLOW_START \
  _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wformat-overflow\"")
+ _Pragma ("GCC diagnostic ignored \"-Wredundant-decls\"")
 #define PRAGMA_IGNORE_WARNING_END \
  _Pragma ("GCC diagnostic pop")
 #define FALLTHROUGH_IS_OK \
@@ -208,10 +211,12 @@ void rasqal_system_free(void *ptr);
 #define PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START \
  _Pragma ("GCC diagnostic push") \
  _Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"")
-#define PRAGMA_IGNORE_WARNING_FORMAT_TRUNCATION_START \
- _Pragma ("GCC diagnostic push")
 #define PRAGMA_IGNORE_WARNING_FORMAT_OVERFLOW_START \
  _Pragma ("GCC diagnostic push")
+#define PRAGMA_IGNORE_WARNING_FORMAT_TRUNCATION_START \
+ _Pragma ("GCC diagnostic push")
+#define PRAGMA_IGNORE_WARNING_REDUNDANT_DECLS_OVERFLOW_START \
+ _Pragma ("GCC diagnostic push"
 #define PRAGMA_IGNORE_WARNING_END \
  _Pragma ("GCC diagnostic pop")
 #define FALLTHROUGH_IS_OK \
@@ -220,6 +225,7 @@ void rasqal_system_free(void *ptr);
 #define PRAGMA_IGNORE_WARNING_FORMAT_NONLITERAL_START
 #define PRAGMA_IGNORE_WARNING_FORMAT_OVERFLOW_START
 #define PRAGMA_IGNORE_WARNING_FORMAT_TRUNCATION_START
+#define PRAGMA_IGNORE_WARNING_REDUNDANT_DECLS_OVERFLOW_START
 #define PRAGMA_IGNORE_WARNING_END
 #define FALLTHROUGH_IS_OK
 #endif

diff --git a/src/timegm.c b/src/timegm.c
@@ -40,13 +40,16 @@ rasqal_timegm(struct tm *tm)
 
 #else
 
-/* function prototype may be in stdlib.h or stdio.h or nowhere? */
-extern int setenv (const char *name, const char *value, int replace);
-extern int unsetenv (const char *name);
+PRAGMA_IGNORE_WARNING_REDUNDANT_DECLS_OVERFLOW_START
+/* function prototype may be in stdlib.h or stdio.h or nowhere */
+extern char *getenv(const char *);
+extern int setenv(const char *name, const char *value, int replace);
+extern int unsetenv(const char *name);
 
 /* time.h or nowhere */
 extern void tzset(void);
 
+PRAGMA_IGNORE_WARNING_END
 
 time_t
 rasqal_timegm(struct tm *tm)