diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-29 03:22:05 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-29 03:22:05 (GMT) |
| commit | 8945b5ec77b5faf0b7d85093a450994408880725 (patch) | |
| tree | da8316f5291cfba1499a526b912dfdf669ad76c6 /src/Misc.cpp | |
| parent | b46f982defc1b832b0d56681d622a29d0db37bb2 (diff) | |
| parent | 110fa71a2ce2c35352fe9ebad4727d7a1fac23a7 (diff) | |
| download | powder-8945b5ec77b5faf0b7d85093a450994408880725.zip powder-8945b5ec77b5faf0b7d85093a450994408880725.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/Misc.cpp')
| -rw-r--r-- | src/Misc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Misc.cpp b/src/Misc.cpp index 21e5cac..978b05b 100644 --- a/src/Misc.cpp +++ b/src/Misc.cpp @@ -279,7 +279,7 @@ void *file_load(char *fn, int *size) int cpu_check(void) { -#ifdef MACOSX +/*#ifdef MACOSX return 0; #else #ifdef X86 @@ -301,7 +301,7 @@ int cpu_check(void) return 1; #endif #endif -#endif +#endif*/ return 0; } |