Remove need for winprefix.h and moved alloca define to osdcomm.h (nw)

This commit is contained in:
Miodrag Milanovic 2015-03-31 11:09:10 +02:00
parent c44d434416
commit 49545f9e84
4 changed files with 7 additions and 26 deletions

View File

@ -1,7 +1,3 @@
forcedincludes {
MAME_DIR .. "src/osd/windows/winprefix.h"
}
defines {
"UNICODE",
"_UNICODE",
@ -13,4 +9,5 @@ defines {
"DIRECTINPUT_VERSION=0x0800",
"SDLMAME_NET_PCAP",
"main=utf8_main",
"_WIN32_WINNT=0x0501",
}

View File

@ -242,4 +242,10 @@ static __inline double log2(double x) { return log(x) * M_LOG2E; }
#endif
#endif
#ifdef __GNUC__
#ifndef alloca
#define alloca __builtin_alloca
#endif
#endif
#endif /* __OSDCOMM_H__ */

View File

@ -77,6 +77,3 @@ struct _IO_FILE {}; //_IO_FILE is an opaque type in the emscripten libc which m
#endif /* SDLMAME_UNIX */
#ifdef __GNUC__
#define alloca __builtin_alloca
#endif

View File

@ -1,19 +0,0 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
//============================================================
//
// winprefix.h - Win32 prefix file, included by ALL files
//
//============================================================
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0501 // Windows XP
#endif
#ifdef __GNUC__
#ifndef alloca
#define alloca __builtin_alloca
#endif
#define min(x,y) fmin(x,y)
#define max(x,y) fmax(x,y)
#endif