From: DRC <information@libjpeg-turbo.org>
Date: Thu, 11 Jul 2019 22:05:15 +0000 (-0500)
Subject: tjutil.c: Fix compiler warning with Visual Studio
X-Git-Tag: 2.0.3~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=875e873f268df7de891d4b5a5317a50014a553b7;p=libjpeg-turbo

tjutil.c: Fix compiler warning with Visual Studio

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.
---

diff --git a/tjutil.c b/tjutil.c
index e4f9b42..2018160 100644
--- a/tjutil.c
+++ b/tjutil.c
@@ -26,11 +26,10 @@
  * 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)
 {