]> granicus.if.org Git - libjpeg-turbo/commitdiff
tjutil.c: Fix compiler warning with Visual Studio
authorDRC <information@libjpeg-turbo.org>
Thu, 11 Jul 2019 22:05:15 +0000 (17:05 -0500)
committerDRC <information@libjpeg-turbo.org>
Thu, 11 Jul 2019 22:06:08 +0000 (17:06 -0500)
Apparently windows.h includes stdlib.h, which defines the max() and
min() macros, so we need to ensure that tjutil.h is included after
that.

tjutil.c

index e4f9b42626e1876af32a20df597c7c42b2a7cae8..2018160b161f63179dbfcf303f5a192f1298627b 100644 (file)
--- a/tjutil.c
+++ b/tjutil.c
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "tjutil.h"
-
 #ifdef _WIN32
 
 #include <windows.h>
+#include "tjutil.h"
 
 static double getFreq(void)
 {
@@ -58,6 +57,7 @@ double getTime(void)
 
 #include <stdlib.h>
 #include <sys/time.h>
+#include "tjutil.h"
 
 double getTime(void)
 {