[srm-cvs] CVS Update: - Added HAVE_DYLD, and took out bad debug code..

Date: Sat Feb 23 20:59:23 CET 2002
User: Dan Kalowsky
Directory: srm/main/src

Log Message:
 [0.51]
 - Added HAVE_DYLD, and took out bad debug code..
 
 
Modified files:
           srm/configure.in (version: 1.52)
           srm/main/src/srm_modules.c (version: 1.63)
           srm/main/src/srm_modules.h (version: 1.31)

[FILE: /srm/configure.in]

--- srm/configure.in:1.51 Sun Feb 10 13:48:11 2002 GMT
+++ srm/configure.in Sat Feb 23 18:59:19 2002 GMT
@@ -1,4 +1,4 @@
-dnl $Id: cvstemp,v 1.51 2002/02/10 14:48:11 derick Exp $
+dnl $Id: cvstemp,v 1.52 2002/02/23 19:59:19 kalowsky Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -177,6 +177,7 @@
   *darwin*|*rhapsody*)
     CFLAGS="$CFLAGS -Wno-long-double"
     AC_DEFINE(SRM_MACOSX,1,[ ])
+ AC_DEFINE(HAVE_DYLD,1, [ ])
     ;;
 esac
           

[FILE: /srm/main/src/srm_modules.c]

--- srm/main/src/srm_modules.c:1.62 Sat Feb 23 17:50:47 2002 GMT
+++ srm/main/src/srm_modules.c Sat Feb 23 18:59:22 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.62 2002/02/23 18:50:47 kalowsky Exp $ */
+/* $Id: cvstemp,v 1.63 2002/02/23 19:59:22 kalowsky Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -38,7 +38,7 @@
 static srm_bool dummy (void * dummy) { return TRUE; };
 
 
-#if defined(SRM_MACOSX)
+#if HAVE_DYLD
 NSModule srm_ns_load (char* libname)
 {
         NSObjectFileImage image;
@@ -70,7 +70,7 @@
          */
 }
 
-#endif /* SRM_MACOSX */
+#endif /* HAVE_DYLD */
 
 /*
  * Initialize the module hash

[FILE: /srm/main/src/srm_modules.h]

--- srm/main/src/srm_modules.h:1.30 Sat Feb 23 18:09:22 2002 GMT
+++ srm/main/src/srm_modules.h Sat Feb 23 18:59:22 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.30 2002/02/23 19:09:22 derick Exp $ */
+/* $Id: cvstemp,v 1.31 2002/02/23 19:59:22 kalowsky Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -32,7 +32,7 @@
 # include <dlfcn.h>
 #endif
 
-#if SRM_MACOSX /* NeXT/Apple dynamic linker */
+#if HAVE_DYLD/* NeXT/Apple dynamic linker */
 #include <mach-o/dyld.h>
 #endif
 
@@ -132,14 +132,7 @@
 
 # define SRM_DLMODULES_SUPPORT 1
 
-/* commenting out this section temporarily */
-#if defined(DEBUG_DAN)
-#endif /* HAVE_LIBDL */
-
-#if defined(SRM_MACOSX) /* start SRM_MACOSX should really be HAVE_DYLD*/
-#endif /* DEBUG_DAN */
-
-#elif defined(SRM_MACOSX)
+#elif HAVE_DYLD
 
 /* functions */
 NSSymbol srm_ns_symbol (void *handle, char* symname);
@@ -154,7 +147,7 @@
 
 /* enable module support */
 # define SRM_DLMODULES_SUPPORT 1
-# else /* end SRM_MACOSX, start rest not supported*/
+# else /* rest not supported*/
 # define SRM_DLMODULES_SUPPORT 0
 #endif /* HAVE_LIBDL */
 
Received on Sat Feb 23 20:59:42 2002