WZ_OS_MAC now no longer unsets WZ_OS_UNIX due to compatability update in

r1638.  Exception handler still removed if WZ_OS_MAC is set.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1640 4a71c877-e1ca-e34f-864e-861f7616d084

lib/framework/exceptionhandler.c

@@ -88,7 +88,7 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo)
 	return EXCEPTION_CONTINUE_SEARCH;
 }
 
-#elif defined(WZ_OS_UNIX)
+#elif defined(WZ_OS_UNIX) && !defined(WZ_OS_MAC)
 
 // C99 headers:
 # include <stdint.h>
@@ -538,7 +538,7 @@ void setupExceptionHandler(const char * programCommand_x)
 {
 #if defined(WZ_OS_WIN)
 	SetUnhandledExceptionFilter(windowsExceptionHandler);
-#elif defined(WZ_OS_UNIX)
+#elif defined(WZ_OS_UNIX) && !defined(WZ_OS_MAC)
 	// Get full path to 'gdb'
 	FILE * whichStream = popen("which gdb", "r");
 	fread(gdbPath, 1, MAX_PATH, whichStream);

lib/framework/platform.h

@@ -55,11 +55,6 @@
 #    define inline __inline
 #  endif /* WZ_CC_MSVC */
 
-#elif defined(WZ_OS_MAC)
-
-#  include <sys/syslimits.h>
-#  define MAX_PATH PATH_MAX
-
 #elif defined(WZ_OS_UNIX)
 
 #  include <limits.h>

lib/framework/wzglobal.h

@@ -95,8 +95,6 @@
 
 #if defined(WZ_OS_WIN)
 #  undef WZ_OS_UNIX
-#elif defined(WZ_OS_MAC)
-#  undef WZ_OS_UNIX
 #elif !defined(WZ_OS_UNIX)
 #  define WZ_OS_UNIX
 #endif /* WZ_OS_WIN */