X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=fdc36ea72a38bddf7a8fb483a42a4a4b02d2facb;hp=62fb5427e0fc80b48dc1909352273369366e2931;hb=66be644c3e5fbd7446d86c79e9e51b75c0442b49;hpb=f4e9bcd703852c51c97d2586872b9b26389899e6

diff --git a/rmac.h b/rmac.h
index 62fb542..fdc36ea 100644
--- a/rmac.h
+++ b/rmac.h
@@ -9,10 +9,19 @@
 #ifndef __RMAC_H__
 #define __RMAC_H__
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 //
 // TARGET SPECIFIC BUILD SETTINGS
 //
 #if defined(WIN32) || defined (WIN64)
+	#include <io.h>
+	#include <fcntl.h>
 	// Release platform - windows
 	#define PLATFORM        "Win32"
 	#define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
@@ -31,50 +40,39 @@
 	// usage:
 	// WARNING(FIXME: Code removed because...)
 
+	#else
+	//If we're not compiling for Visual Studio let's assume that we're using
+	//some flavour of gcc instead. So let's use the gcc compliant macro instead.
+	//If some weirdo uses something else (I dunno, Intel compiler or something?)
+	//this is probably going to explode spectacularly. Let's wait for the fireworks!
+	#define DO_PRAGMA(x) _Pragma (#x)
+	#define WARNING(desc) DO_PRAGMA(message (#desc))
+	#define inline __inline
+
 	#endif
-	#include <io.h>
-	#include <fcntl.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <ctype.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
 
 #else 
 	#ifdef __GCCUNIX__
+	#include <sys/fcntl.h>
+	#include <unistd.h>
 	// Release platform - mac OS-X or linux
 	#define PLATFORM        "OSX/Linux"
 	#define _OPEN_FLAGS     O_TRUNC|O_CREAT|O_RDWR
 	#define _OPEN_INC       O_RDONLY
-	#define _PERM_MODE      S_IREAD|S_IWRITE 
+	#define _PERM_MODE      S_IRUSR|S_IWUSR
 	// WARNING WARNING WARNING
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
-	#include <sys/fcntl.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <ctype.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
-	#include <unistd.h>
 #else
 	// Release platform - not specified 
+	#include <sys/fcntl.h>
 	#define PLATFORM        "Unknown"
 	#define _OPEN_FLAGS     O_TRUNC|O_CREAT|O_RDWR
 	#define _OPEN_INC       O_RDONLY
-	#define _PERM_MODE      S_IREAD|S_IWRITE 
-	// Defined here, even though the platfrom may not support it...
+	#define _PERM_MODE      S_IREAD|S_IWRITE
+	// Defined here, even though the platform may not support it...
 	#define DO_PRAGMA(x) _Pragma (#x)
 	#define WARNING(desc) DO_PRAGMA(message (#desc))
-	#include <sys/fcntl.h>
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <ctype.h>
-	#include <sys/types.h>
-	#include <sys/stat.h>
 	#endif
 #endif
 
@@ -202,6 +200,8 @@ extern int lsym_flag;
 extern int sbra_flag;
 extern int obj_format;
 extern int legacy_flag;
+extern LONG PRGFLAGS;
+extern int optim_flag;
 
 // Exported functions
 char * fext(char *, char *, int);