From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 2 Oct 2012 06:47:37 +0000 (+0000)
Subject: Fix MinGW build and remove duplication of effort
X-Git-Tag: 1.2.90~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc2e66cb433c04514f61d9b58be23e667bd8f8d8;p=libjpeg-turbo

Fix MinGW build and remove duplication of effort


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

diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c
index d570ee9..96a4a68 100644
--- a/turbojpeg-jni.c
+++ b/turbojpeg-jni.c
@@ -29,6 +29,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "turbojpeg.h"
+#ifdef WIN32
+#include "tjutil.h"
+#endif
 #include <jni.h>
 #include "java/org_libjpegturbo_turbojpeg_TJCompressor.h"
 #include "java/org_libjpegturbo_turbojpeg_TJDecompressor.h"
@@ -41,11 +44,6 @@
 	goto bailout;  \
 }
 
-#ifdef WIN32
-#define snprintf(str, n, format, ...)  \
-	_snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
-#endif
-
 #define bailif0(f) {if(!(f)) {  \
 	char temps[80];  \
 	snprintf(temps, 80, "Unexpected NULL condition in line %d", __LINE__);  \