Index: magic.c
===================================================================
--- magic.c	(revision 65)
+++ magic.c	(working copy)
@@ -80,8 +80,8 @@
 
 int qcmp_skill( const void *left, const void *right )
 {
-    const struct skill_type *a = left;
-    const struct skill_type *b = right;
+    const struct skill_type *a = (const skill_type *) left;
+    const struct skill_type *b = (const skill_type *) right;
 
     if ( !a && !b )
         return 0;
Index: sha256.c
===================================================================
--- sha256.c	(revision 65)
+++ sha256.c	(working copy)
@@ -36,9 +36,11 @@
 #if defined(__FreeBSD__)
 #include <sys/endian.h>
 #else
+#ifndef MACOSX
 #include <endian.h>
 #endif
 #endif
+#endif
 #include "sha256.h"
 
 #if __FreeBSD_version < 500111
Index: comm.c
===================================================================
--- comm.c	(revision 65)
+++ comm.c	(working copy)
@@ -234,6 +234,8 @@
         log_boot( "PID written to %s", pidfile );
     }
 
+    // the following code is not compatible with mac os x, so I am removing it for now. --Ghasatta.
+#ifndef MACOSX
     /*
      * If we want stderr to go to a filename, now's the time!
      */
@@ -241,13 +243,15 @@
     {
         log_boot( "Switching to %s as stderr.", logfile );
         stderr = freopen( logfile, "a", stderr );
-        if ( !stderr )
+	if ( !stderr )
             proper_exit( MUD_HALT, "Cannot reopen stderr!" );
         close( fileno( stdout ) );
         dup2( fileno( stderr ), fileno( stdout ) );
         log_boot( "Switch to %s completed.", logfile );
+	
     }
-
+#endif
+    
     /*
      * Run the game.
      */
Index: merc.h
===================================================================
--- merc.h	(revision 65)
+++ merc.h	(working copy)
@@ -29,6 +29,12 @@
 *       ROM license, in the file Rom24/doc/rom.license                     *
 ***************************************************************************/
 
+#ifdef MACOSX
+#include <time.h>
+#endif
+
+#include <string>
+
 /*
  * LEGACY:
  * These things are here to make snippet integration easier.
Index: Makefile
===================================================================
--- Makefile	(revision 65)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 #
 
 CC      	= g++
+SYS = #-DMACOSX
 
 CRYPT		= #-DNOCRYPT		# Uncomment to use clear-text passwords
 RAND		= #-DOLD_RAND		# Uncomment if your random number generator is broken
@@ -36,7 +37,7 @@
 
 OPTIONS		= $(OPT) $(DEBUG) $(PROF) $(CRYPT) $(RAND) $(SOCIAL) $(PLAYERLIST)
 
-C_FLAGS 	= $(WARN) $(OPTIONS)
+C_FLAGS 	= $(WARN) $(OPTIONS) $(SYS)
 L_FLAGS 	= $(DEBUG) $(PROF)
 
 LIBS		= 				# Uncomment if you're using Linux