comparison dmd/mars.c @ 535:f79bbd1d0b27

Add __APPLE__ to most #if linux compile time switches.
author Jacob Carlborg <doob@me.com> <jacob.carlborg@gmail.com>
date Sun, 24 Aug 2008 16:54:06 +0200
parents 7e2867ed70d9
children 0d2db7efa105
comparison
equal deleted inserted replaced
534:7e2867ed70d9 535:f79bbd1d0b27
17 17
18 #if __DMC__ 18 #if __DMC__
19 #include <dos.h> 19 #include <dos.h>
20 #endif 20 #endif
21 21
22 #if linux 22 #if linux || __APPLE__
23 #include <errno.h> 23 #include <errno.h>
24 #elif _WIN32 24 #elif _WIN32
25 #include <windows.h> 25 #include <windows.h>
26 #endif 26 #endif
27 27
58 obj_ext = "bc"; 58 obj_ext = "bc";
59 ll_ext = "ll"; 59 ll_ext = "ll";
60 bc_ext = "bc"; 60 bc_ext = "bc";
61 #if _WIN32 61 #if _WIN32
62 nativeobj_ext = "obj"; 62 nativeobj_ext = "obj";
63 #elif linux 63 #elif linux || __APPLE__
64 nativeobj_ext = "o"; 64 nativeobj_ext = "o";
65 #else 65 #else
66 #error "fix this" 66 #error "fix this"
67 #endif 67 #endif
68 68
321 //VersionCondition::addPredefinedGlobalIdent("D_Bits"); 321 //VersionCondition::addPredefinedGlobalIdent("D_Bits");
322 VersionCondition::addPredefinedGlobalIdent("all"); 322 VersionCondition::addPredefinedGlobalIdent("all");
323 323
324 #if _WIN32 324 #if _WIN32
325 inifile(global.params.argv0, "llvmdc.ini"); 325 inifile(global.params.argv0, "llvmdc.ini");
326 #elif linux 326 #elif linux || __APPLE__
327 inifile(global.params.argv0, "llvmdc.conf"); 327 inifile(global.params.argv0, "llvmdc.conf");
328 #else 328 #else
329 #error 329 #error
330 #endif 330 #endif
331 getenv_setargv("DFLAGS", &argc, &argv); 331 getenv_setargv("DFLAGS", &argc, &argv);