[Emacs-diffs] emacs-24 r117008: Port to GCC 4.9.0 with --enable-gcc-warnings.

[Paul Eggert]

------------------------------------------------------------
revno: 117008
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert  <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-22 13:19:17 -0700
message:
  Port to GCC 4.9.0 with --enable-gcc-warnings.
  
  * image.c (struct my_jpeg_error_mgr) [lint]: Remove member fp.
  All uses removed.
  (jpeg_load_body) [lint]: Add a 'volatile' to pacify a buggy GCC in
  a way that also works with GCC 4.9.0.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-04-22 20:13:59 +0000
+++ b/src/ChangeLog     2014-04-22 20:19:17 +0000
@@ -1,5 +1,11 @@
 2014-04-22  Paul Eggert  <address@hidden>
 
+       Port to GCC 4.9.0 with --enable-gcc-warnings.
+       * image.c (struct my_jpeg_error_mgr) [lint]: Remove member fp.
+       All uses removed.
+       (jpeg_load_body) [lint]: Add a 'volatile' to pacify a buggy GCC in
+       a way that also works with GCC 4.9.0.
+
        * search.c (Fnewline_cache_check): Remove unused locals.
 
 2014-04-22  Eli Zaretskii  <address@hidden>

=== modified file 'src/image.c'
--- a/src/image.c       2014-02-19 17:26:14 +0000
+++ b/src/image.c       2014-04-22 20:19:17 +0000
@@ -6262,9 +6262,6 @@
       MY_JPEG_INVALID_IMAGE_SIZE,
       MY_JPEG_CANNOT_CREATE_X
     } failure_code;
-#ifdef lint
-  FILE *fp;
-#endif
 };
 
 
@@ -6479,7 +6476,8 @@
 {
   Lisp_Object file, specified_file;
   Lisp_Object specified_data;
-  FILE *fp = NULL;
+  /* The 'volatile' silences a bogus diagnostic; see GCC bug 54561.  */
+  FILE * IF_LINT (volatile) fp = NULL;
   JSAMPARRAY buffer;
   int row_stride, x, y;
   XImagePtr ximg = NULL;
@@ -6512,8 +6510,6 @@
       return 0;
     }
 
-  IF_LINT (mgr->fp = fp);
-
   /* Customize libjpeg's error handling to call my_error_exit when an
      error is detected.  This function will perform a longjmp.  */
   mgr->cinfo.err = fn_jpeg_std_error (&mgr->pub);
@@ -6552,9 +6548,6 @@
       return 0;
     }
 
-  /* Silence a bogus diagnostic; see GCC bug 54561.  */
-  IF_LINT (fp = mgr->fp);
-
   /* Create the JPEG decompression object.  Let it read from fp.
         Read the JPEG image header.  */
   fn_jpeg_CreateDecompress (&mgr->cinfo, JPEG_LIB_VERSION, sizeof 
*&mgr->cinfo);