updated arch_def.h and net_sys.h from uhexen2. adjusted users accordingly.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@793 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer
parent
5311e29e65
commit
9ea0212280
115
Quake/arch_def.h
115
Quake/arch_def.h
|
|
@ -28,39 +28,6 @@
|
|||
#define __ARCH_DEFS__
|
||||
|
||||
|
||||
#if defined(__APPLE__) && defined(__MACH__)
|
||||
# if !defined(__MACOSX__)
|
||||
# define __MACOSX__ 1
|
||||
# endif
|
||||
#elif defined(macintosh) /* MacOS Classic */
|
||||
# if !defined(__MACOS__)
|
||||
# define __MACOS__ 1
|
||||
# endif
|
||||
#elif (defined(__sun) || defined(sun)) && \
|
||||
(defined(__svr4__) || defined(__SVR4))
|
||||
# if !defined(__SOLARIS__)
|
||||
# define __SOLARIS__ 1
|
||||
# endif
|
||||
#elif defined(__sun) || defined(sun)
|
||||
# if !defined(__SUNOS__)
|
||||
# define __SUNOS__ 1
|
||||
# endif
|
||||
#elif defined(__sgi) || defined(sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
|
||||
# if !defined(__IRIX__)
|
||||
# define __IRIX__ 1
|
||||
# endif
|
||||
#elif defined(__QNXNTO__)
|
||||
# if !defined(__QNX__)
|
||||
# define __QNX__ 1
|
||||
# endif
|
||||
#elif defined(__amigados__) || defined(__amigaos4__) || \
|
||||
defined(__AMIGA) || defined(__amigaos__)
|
||||
# if !defined(__AMIGA__)
|
||||
# define __AMIGA__ 1
|
||||
# endif
|
||||
#endif /* end of custom definitions */
|
||||
|
||||
|
||||
#if defined(__DJGPP__) || defined(MSDOS) || defined(__MSDOS__) || defined(__DOS__)
|
||||
|
||||
# if !defined(PLATFORM_DOS)
|
||||
|
|
@ -73,13 +40,21 @@
|
|||
# define PLATFORM_WINDOWS 1
|
||||
# endif
|
||||
|
||||
#elif defined(__MACOS__) || defined(__MACOSX__)
|
||||
#elif defined(__APPLE__) && defined(__MACH__) /* Mac OS X */
|
||||
|
||||
# if !defined(PLATFORM_OSX)
|
||||
# define PLATFORM_OSX 1
|
||||
# endif
|
||||
|
||||
#elif defined(macintosh) /* Mac OS classic */
|
||||
|
||||
# if !defined(PLATFORM_MAC)
|
||||
# define PLATFORM_MAC 1
|
||||
# endif
|
||||
|
||||
#elif defined(__MORPHOS__) || defined(__AMIGA__) || defined(__AROS__)
|
||||
#elif defined(__MORPHOS__) || defined(__AROS__) || \
|
||||
defined(__amigaos__) || defined(__amigaos4__) || \
|
||||
defined(__amigados__) || defined(__AMIGA) || defined(__AMIGA__)
|
||||
|
||||
# if !defined(PLATFORM_AMIGA)
|
||||
# define PLATFORM_AMIGA 1
|
||||
|
|
@ -96,10 +71,13 @@
|
|||
#if defined(__unix) || defined(__unix__) || defined(unix) || \
|
||||
defined(__linux__) || defined(__linux) || \
|
||||
defined(__FreeBSD__) || defined(__DragonFly__) || \
|
||||
defined(__FreeBSD_kernel__) /* Debian GNU/kFreeBSD */ || \
|
||||
defined(__OpenBSD__) || defined(__NetBSD__) || \
|
||||
defined(__hpux) || defined(__hpux__) || defined(_hpux) || \
|
||||
defined(__sun) || defined(sun) || defined(__IRIX__) || \
|
||||
defined(__GNU__) /* GNU/Hurd */ || defined(__QNX__)
|
||||
defined(__sun) || defined(sun) || \
|
||||
defined(__sgi) || defined(sgi) || defined(__sgi__) || \
|
||||
defined(__GNU__) /* GNU/Hurd */ || \
|
||||
defined(__QNX__) || defined(__QNXNTO__)
|
||||
# if !defined(PLATFORM_UNIX)
|
||||
# define PLATFORM_UNIX 1
|
||||
# endif
|
||||
|
|
@ -108,17 +86,68 @@
|
|||
#endif /* end of PLATFORM_ definitions */
|
||||
|
||||
|
||||
/* Platforms that are (mostly) fine
|
||||
* when classified as PLATFORM_UNIX :
|
||||
*/
|
||||
#if defined(__MACOSX__)
|
||||
|
||||
#if defined (PLATFORM_OSX) /* OS X is unix-based */
|
||||
# if !defined(PLATFORM_UNIX)
|
||||
# define PLATFORM_UNIX 2
|
||||
# endif
|
||||
#endif /* OS X -> PLATFORM_UNIX */
|
||||
|
||||
#endif /* end of (pseudo) PLATFORM_UNIX */
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__) || \
|
||||
defined(__FreeBSD_kernel__) /* Debian GNU/kFreeBSD */ || \
|
||||
defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
# if !defined(PLATFORM_BSD)
|
||||
# define PLATFORM_BSD 1
|
||||
# endif
|
||||
#endif /* PLATFORM_BSD (for convenience) */
|
||||
|
||||
|
||||
#if defined(_WIN64)
|
||||
# define PLATFORM_STRING "Win64"
|
||||
#elif defined(_WIN32)
|
||||
# define PLATFORM_STRING "Windows"
|
||||
#elif defined(PLATFORM_DOS)
|
||||
# define PLATFORM_STRING "DOS"
|
||||
#elif defined(__linux__) || defined(__linux)
|
||||
# define PLATFORM_STRING "Linux"
|
||||
#elif defined(__DragonFly__)
|
||||
# define PLATFORM_STRING "DragonFly"
|
||||
#elif defined(__FreeBSD__)
|
||||
# define PLATFORM_STRING "FreeBSD"
|
||||
#elif defined(__NetBSD__)
|
||||
# define PLATFORM_STRING "NetBSD"
|
||||
#elif defined(__OpenBSD__)
|
||||
# define PLATFORM_STRING "OpenBSD"
|
||||
#elif defined(__MORPHOS__)
|
||||
# define PLATFORM_STRING "MorphOS"
|
||||
#elif defined(__AROS__)
|
||||
# define PLATFORM_STRING "AROS"
|
||||
#elif defined(PLATFORM_AMIGA)
|
||||
# define PLATFORM_STRING "AmigaOS"
|
||||
#elif defined(__QNX__) || defined(__QNXNTO__)
|
||||
# define PLATFORM_STRING "QNX"
|
||||
#elif defined(PLATFORM_OSX)
|
||||
# define PLATFORM_STRING "MacOSX"
|
||||
#elif defined(PLATFORM_MAC)
|
||||
# define PLATFORM_STRING "MacOS"
|
||||
#elif defined(__hpux) || defined(__hpux__) || defined(_hpux)
|
||||
# define PLATFORM_STRING "HP-UX"
|
||||
#elif (defined(__sun) || defined(sun)) && (defined(__svr4__) || defined(__SVR4))
|
||||
# define PLATFORM_STRING "Solaris"
|
||||
#elif defined(__sun) || defined(sun)
|
||||
# define PLATFORM_STRING "SunOS"
|
||||
#elif defined(__sgi) || defined(sgi) || defined(__sgi__)
|
||||
# define PLATFORM_STRING "Irix"
|
||||
#elif defined(PLATFORM_RISCOS)
|
||||
# define PLATFORM_STRING "RiscOS"
|
||||
#elif defined(__GNU__)
|
||||
# define PLATFORM_STRING "GNU/Hurd"
|
||||
#elif defined(PLATFORM_UNIX)
|
||||
# define PLATFORM_STRING "Unix"
|
||||
#else
|
||||
# define PLATFORM_STRING "Unknown"
|
||||
# warning "Platform is UNKNOWN."
|
||||
#endif /* end of PLATFORM_STRING definitions */
|
||||
|
||||
#endif /* __ARCH_DEFS__ */
|
||||
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ void IN_SendKeyEvents (void)
|
|||
if (sym == SDLK_BACKSPACE)
|
||||
usym = sym; /* avoid change to SDLK_DELETE */
|
||||
#endif /* Mac OS X */
|
||||
#if defined(__QNX__)
|
||||
#if defined(__QNX__) || defined(__QNXNTO__)
|
||||
if (sym == SDLK_BACKSPACE || sym == SDLK_RETURN)
|
||||
usym = sym; /* S.A: fixes QNX weirdness */
|
||||
#endif /* __QNX__ */
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ void Key_Console (int key)
|
|||
|
||||
case 'v':
|
||||
case 'V':
|
||||
#if defined(__MACOSX__) || defined(__MACOS__)
|
||||
#if defined(PLATFORM_OSX) || defined(PLATFORM_MAC)
|
||||
if (keydown[K_COMMAND]) { /* Cmd+v paste (Mac-only) */
|
||||
PasteToConsole();
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -58,10 +58,8 @@
|
|||
#include <stddef.h>
|
||||
#include <limits.h>
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__) || \
|
||||
defined(__OpenBSD__) || defined(__NetBSD__) || \
|
||||
#if defined(PLATFORM_BSD) || defined(PLATFORM_OSX) || \
|
||||
defined(PLATFORM_AMIGA) /* bsdsocket.library */ || \
|
||||
defined(__MACOSX__) || defined(__FreeBSD_kernel__) || \
|
||||
defined(__GNU__) /* GNU/Hurd */ || defined(__riscos__)
|
||||
/* struct sockaddr has unsigned char sa_len as the first member in BSD
|
||||
* variants and the family member is also an unsigned char instead of an
|
||||
|
|
|
|||
Loading…
Reference in New Issue