diff options
| author | Kenichi Handa | 2013-04-05 23:17:55 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-04-05 23:17:55 +0900 |
| commit | b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f (patch) | |
| tree | f32c8cce416e346d2953f063a0f22e95382cf57e /src/bytecode.c | |
| parent | 251e91474c91e16b101502c2ed7c05fc13e4ecea (diff) | |
| parent | 73931ad14ad7a51d91f10b19ae9ca8cadb256916 (diff) | |
| download | emacs-b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f.tar.gz emacs-b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f.zip | |
merge trunk
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index acb96c1e61b..7676c8550a4 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -660,7 +660,7 @@ 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__ | 663 | #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) |
| 664 | # pragma GCC diagnostic push | 664 | # pragma GCC diagnostic push |
| 665 | # pragma GCC diagnostic ignored "-Woverride-init" | 665 | # pragma GCC diagnostic ignored "-Woverride-init" |
| 666 | #endif | 666 | #endif |
| @@ -676,7 +676,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, | |||
| 676 | #undef DEFINE | 676 | #undef DEFINE |
| 677 | }; | 677 | }; |
| 678 | 678 | ||
| 679 | #if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ | 679 | #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) |
| 680 | # pragma GCC diagnostic pop | 680 | # pragma GCC diagnostic pop |
| 681 | #endif | 681 | #endif |
| 682 | 682 | ||