We actually don't need windows.h at all, and it makes both MinGW and VC++ unhappy because of conflicting macros (such as INT32 in jmorecfg.h)
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@511 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
6
rrutil.h
6
rrutil.h
@@ -16,12 +16,10 @@
|
|||||||
#ifndef __RRUTIL_H__
|
#ifndef __RRUTIL_H__
|
||||||
#define __RRUTIL_H__
|
#define __RRUTIL_H__
|
||||||
|
|
||||||
#ifdef _WIN32
|
#if defined(_WIN32) && !defined(__MINGW32__)
|
||||||
#include <windows.h>
|
#include <stdio.h>
|
||||||
#ifndef __MINGW32__
|
|
||||||
#define snprintf(str, n, format, ...) \
|
#define snprintf(str, n, format, ...) \
|
||||||
_snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
|
_snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
|
||||||
#endif
|
|
||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#define stricmp strcasecmp
|
#define stricmp strcasecmp
|
||||||
|
|||||||
Reference in New Issue
Block a user