almost finished OSLib

2 files changed, 16 insertions, 2 deletions

diff --git a/includes/common.h b/includes/common.h
index 8f9c346..809f99f 100644
--- a/includes/common.h
+++ b/includes/common.h
@@ -15,6 +15,14 @@
 //#include <MacHeadersMach-O>
 #define CW_PASCAL pascal
 #undef toupper
+#undef tolower
+
+// What the fuck is this haha
+// typedef char * va_list;
+#define va_start(a,b) (a = ((va_list) __builtin_next_arg(b)))
+#define va_arg(a,b) (*(b *) (void *) ((a = (char *) (((((unsigned long)(a)) + ((__alignof__ (b) == 16) ? 15 : 3)) & ~((__alignof__ (b) == 16) ? 15 : 3)) + ((sizeof (b) + 3) & ~3))) - ((sizeof (b) + 3) & ~3)))
+#define va_end(a) ((void)0)
+
 #else
 #include <stdarg.h>
 // expand this to nothing
diff --git a/includes/oslib.h b/includes/oslib.h
index fa444a3..fadc81f 100644
--- a/includes/oslib.h
+++ b/includes/oslib.h
@@ -54,12 +54,15 @@ typedef struct {
     OSPathSpec spec;
 } OSOpenedDir; // assumed name, might be something like OSDirRef though?
 
+#ifdef	__MWERKS__
+#pragma options align=packed
+#endif
 typedef struct OSFileTypeMapping {
     OSType mactype;
     const char *magic;
     char length;
+    char executable;
     const char *mimetype;
-    char executable; // not sure why this is rearranged
 } OSFileTypeMapping;
 
 typedef struct OSFileTypeMappingList {
@@ -71,10 +74,13 @@ typedef struct OSFileTypeMappings {
     OSFileTypeMappingList *mappingList;
     struct OSFileTypeMappings *next;
 } OSFileTypeMappings;
+#ifdef	__MWERKS__
+#pragma options align=reset
+#endif
 
 /********************************/
 /* Generic */
-extern int WildCardMatch(const char *wild, const char *name);
+extern int WildCardMatch(char *wild, char *name);
 extern OSSpec *OS_MatchPath(const char *path);
 extern char *OS_GetFileNamePtr(char *path);
 extern char *OS_GetDirName(const OSPathSpec *spec, char *buf, int size);