Changeset: 0399ba5d2489 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0399ba5d2489
Modified Files:
common/utils/mutils.c
tools/mserver/mserver5.c
Branch: Apr2011
Log Message:
get_bin_path: fix compilation on Darwin
diffs (28 lines):
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -24,6 +24,10 @@
#include <unistd.h>
#include "mutils.h"
+#ifdef HAVE_MACH_O_DYLD_H
+# include <mach-o/dyld.h> /* _NSGetExecutablePath on OSX >=10.5 */
+#endif
+
#ifdef NATIVE_WIN32
#include <stdio.h>
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -49,10 +49,6 @@
#include <Psapi.h> /* for GetModuleFileName */
#endif
-#ifdef HAVE_MACH_O_DYLD_H
-# include <mach-o/dyld.h> /* _NSGetExecutablePath on OSX >=10.5 */
-#endif
-
#ifdef _CRTDBG_MAP_ALLOC
/* Windows only:
our definition of new and delete clashes with the one if
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
