[Emacs-diffs] Changes to emacs/src/image.c

[Juanma Barranquero]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.23 emacs/src/image.c:1.24
*** emacs/src/image.c:1.23      Tue May 10 09:16:46 2005
--- emacs/src/image.c   Fri May 20 17:50:59 2005
***************
*** 1631,1641 ****
       Lisp_Object spec;
  {
    struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
- #ifdef _MSC_VER
-   /* Work around a problem with MinGW builds of graphics libraries
-      not honoring calling conventions.  */
-   static
- #endif
    struct image *img;
    int i;
    unsigned hash;
--- 1631,1636 ----
***************
*** 1815,1821 ****
  #ifdef HAVE_NTGUI
  
  /* Macro for defining functions that will be loaded from image DLLs.  */
! #define DEF_IMGLIB_FN(func) FARPROC fn_##func
  
  /* Macro for loading those image functions from the library.  */
  #define LOAD_IMGLIB_FN(lib,func) {                                    \
--- 1810,1816 ----
  #ifdef HAVE_NTGUI
  
  /* Macro for defining functions that will be loaded from image DLLs.  */
! #define DEF_IMGLIB_FN(func) int (FAR CDECL *fn_##func)()
  
  /* Macro for loading those image functions from the library.  */
  #define LOAD_IMGLIB_FN(lib,func) {                                    \
***************
*** 5744,5755 ****
     PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
     bytes from the input to DATA.  */
  
- #ifdef _MSC_VER
-   /* Work around a problem with MinGW builds of graphics libraries
-      not honoring calling conventions.  */
- #pragma optimize("g", off)
- #endif
- 
  static void
  png_read_from_memory (png_ptr, data, length)
       png_structp png_ptr;
--- 5739,5744 ----
***************
*** 5766,5775 ****
    tbr->index = tbr->index + length;
  }
  
- #ifdef _MSC_VER
- /* Restore normal optimization, as specified on the command line.  */
- #pragma optimize("", on)
- #endif
  
  /* Load PNG image IMG for use on frame F.  Value is non-zero if
     successful.  */
--- 5755,5760 ----