Bug 703948: move pragmas out of function body

Older gcc versions give the error:
"#pragma GCC diagnostic not allowed inside functions",

1 files changed, 4 insertions, 11 deletions

diff --git a/base/scommon.h b/base/scommon.h
index d8bdda8cc..542b960ca 100644
--- a/base/scommon.h
+++ b/base/scommon.h
@@ -115,35 +115,28 @@ typedef union stream_cursor_s {
  * This allows localized disabling of the "array bounds" compiler
  * warning for this one specific case.
  */
-static inline void
-stream_cursor_read_init(stream_cursor_read *r, const byte *buf, size_t length)
-{
 #ifdef __GNUC__
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
+static inline void
+stream_cursor_read_init(stream_cursor_read *r, const byte *buf, size_t length)
+{
     /* starting pos for pointer is always one position back */
     r->ptr = buf - 1;
     r->limit = r->ptr + length;
-#ifdef __GNUC__
-#  pragma GCC diagnostic pop
-#endif
 }
 
 static inline void
 stream_cursor_write_init(stream_cursor_write *w, const byte *buf, size_t length)
 {
-#ifdef __GNUC__
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
     /* starting pos for pointer is always one position back */
     w->ptr = (byte *)buf - 1;
     w->limit = (byte *)w->ptr + length;
+}
 #ifdef __GNUC__
 #  pragma GCC diagnostic pop
 #endif
-}
 
 /*
  * Define the prototype for the procedures known to both the generic