diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-02 14:55:41 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-02 15:06:39 +0100 |
| commit | 472560d73f947309000c50e9c562a8ab7bb13d25 (patch) | |
| tree | 2c0fa3db37ff90563094a86b4447c1b934b1cb39 /crawl-ref | |
| parent | a2c9f19f6f64a781722ca602c393731d456cf3b3 (diff) | |
| download | crawl-ref-472560d73f947309000c50e9c562a8ab7bb13d25.tar.gz crawl-ref-472560d73f947309000c50e9c562a8ab7bb13d25.zip | |
Don't mistake Hurd for some fruit, both use Mach (Pino Toscano).
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/platform.h | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index e363b0a883..23267b635f 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -52,10 +52,10 @@ #ifdef TARGET_OS_WINDOWS #define WIN32_LEAN_AND_MEAN #include <windows.h> +#elif defined ( __APPLE__ ) +extern char **NXArgv; #elif defined ( __linux__ ) #include <unistd.h> -#elif defined ( __MACH__ ) -extern char **NXArgv; #endif const std::string game_options::interrupt_prefix = "interrupt_"; diff --git a/crawl-ref/source/platform.h b/crawl-ref/source/platform.h index 654f35470d..635d94f6e2 100644 --- a/crawl-ref/source/platform.h +++ b/crawl-ref/source/platform.h @@ -262,12 +262,19 @@ #endif #if !defined (OS_DETECTED) -#if defined (__APPLE__) || defined (__MACH__) +#if defined (__APPLE__) #define OS_DETECTED #define TARGET_OS_MACOSX #endif #endif +#if !defined (OS_DETECTED) +#if defined (__hurd__) +#define OS_DETECTED +#define TARGET_OS_HURD +#endif +#endif + #if defined (_LP64) || defined (__LP64__) || defined (_M_X64) || defined(_M_IA64) #define TARGET_CPU_BITS 64 #else |