ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MinGW build and remove duplication of effort

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@864 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2012-10-02 06:47:37 +00:00
parent d9d1d67d7c
commit bc2e66cb43
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
turbojpeg-jni.c
View File

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