Index: /trunk/source/lisp-kernel/pmcl-kernel.c
===================================================================
--- /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 14204)
+++ /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 14205)
@@ -16,11 +16,4 @@
 */
 
-#ifdef DARWIN
-/*	dyld.h included here because something in "lisp.h" causes
-    a conflict (actually I think the problem is in "constants.h")
-*/
-/* #include <mach-o/dyld.h> */
-
-#endif
 #include "lisp.h"
 #include "lisp_globals.h"
@@ -91,4 +84,6 @@
 #include <mach/port.h>
 #include <sys/sysctl.h>
+#undef undefined
+#include <mach-o/dyld.h>
 #include <dlfcn.h>
 #endif
@@ -981,6 +976,6 @@
   uint32_t len = 1024;
   char exepath[1024], *p = NULL;
-
-  if (_NSGetExecutablePath(exepath, (void *)&len) == 0) {
+    
+  if (_NSGetExecutablePath(exepath, &len) == 0) {
     p = malloc(len+1);
     memmove(p, exepath, len);