aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-07-10 15:40:34 -0700
committerPaul Eggert2012-07-10 15:40:34 -0700
commitffacb12679a1e001981c2e0f690b327eda652d04 (patch)
treea6e5989e1045ab06da840f4e59e1c58b6a412e52 /src
parent358c19d98cf359287eb7f7028fe79692f054d761 (diff)
downloademacs-ffacb12679a1e001981c2e0f690b327eda652d04.tar.gz
emacs-ffacb12679a1e001981c2e0f690b327eda652d04.zip
* bytecode.c (targets): Suppress -Woverride-init warnings.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/bytecode.c10
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index af0fc3a8e38..d7ae52ac01e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-07-10 Paul Eggert <eggert@cs.ucla.edu> 12012-07-10 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * bytecode.c (targets): Suppress -Woverride-init warnings.
4
3 Simplify by avoiding confusing use of strncpy etc. 5 Simplify by avoiding confusing use of strncpy etc.
4 * doc.c (Fsnarf_documentation): 6 * doc.c (Fsnarf_documentation):
5 * fileio.c (Ffile_name_directory, Fsubstitute_in_file_name): 7 * fileio.c (Ffile_name_directory, Fsubstitute_in_file_name):
diff --git a/src/bytecode.c b/src/bytecode.c
index 4d3a35ee24d..acdf809971f 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -660,6 +660,11 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
660 the table clearer. */ 660 the table clearer. */
661#define LABEL(OP) [OP] = &&insn_ ## OP 661#define LABEL(OP) [OP] = &&insn_ ## OP
662 662
663#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
664# pragma GCC diagnostic push
665# pragma GCC diagnostic ignored "-Woverride-init"
666#endif
667
663 /* This is the dispatch table for the threaded interpreter. */ 668 /* This is the dispatch table for the threaded interpreter. */
664 static const void *const targets[256] = 669 static const void *const targets[256] =
665 { 670 {
@@ -670,6 +675,11 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
670 BYTE_CODES 675 BYTE_CODES
671#undef DEFINE 676#undef DEFINE
672 }; 677 };
678
679#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
680# pragma GCC diagnostic pop
681#endif
682
673#endif 683#endif
674 684
675 685