Add additional protections against defining INT32 if another header has already defin...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1593 632fc199-4ca6-4c93-a231-07263d6284db

diff --cc jmorecfg.h
index 108e7de98e75b08bfa5c45aca394c4971e6c47f1,6c085c36a69325d6a04a26ee586f2cbc931fc548..e86ccc6062df31bee2f19621c70fd963a35ba5ef
--- 1/jmorecfg.h
--- 2/jmorecfg.h
+++ b/jmorecfg.h
@@@ -1,10 -1,9 +1,11 @@@
  /*
   * jmorecfg.h
   *
 + * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1991-1997, Thomas G. Lane.
 - * Modified 1997-2011 by Guido Vollbeding.
 - * This file is part of the Independent JPEG Group's software.
++ * Modified 1997-2009 by Guido Vollbeding.
 + * libjpeg-turbo Modifications:
 + * Copyright (C) 2009, 2011, 2014, D. R. Commander.
   * For conditions of distribution and use, see the accompanying README file.
   *
   * This file contains additional configuration options that customize the
@@@ -147,9 -158,15 +148,15 @@@ typedef short INT16
  
  /* INT32 must hold at least signed 32-bit values. */
  
 -#ifndef XMD_H                 /* X11/xmd.h correctly defines INT32 */
 +#ifndef XMD_H                   /* X11/xmd.h correctly defines INT32 */
+ #ifndef _BASETSD_H_           /* Microsoft defines it in basetsd.h */
+ #ifndef _BASETSD_H            /* MinGW is slightly different */
+ #ifndef QGLOBAL_H             /* Qt defines it in qglobal.h */
  typedef long INT32;
  #endif
+ #endif
+ #endif
+ #endif
  
  /* Datatype used for image dimensions.  The JPEG standard only supports
   * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore