fix

1 files changed, 27 insertions, 27 deletions

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 50c76b25..68037d23 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1614,32 +1614,32 @@ static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage) (const struct
                                                             *symbolName) = 0;
 static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
 
-#ifndef NSADDIMAGNUNET_GEOPTION_NONE
-#define NSADDIMAGNUNET_GEOPTION_NONE                          0x0
+#ifndef NSADDIMAGE_OPTION_NONE
+#define NSADDIMAGE_OPTION_NONE                          0x0
 #endif
-#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR
-#define NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR               0x1
+#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
+#define NSADDIMAGE_OPTION_RETURN_ON_ERROR               0x1
 #endif
-#ifndef NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING
-#define NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING                0x2
+#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
+#define NSADDIMAGE_OPTION_WITH_SEARCHING                0x2
 #endif
-#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED         0x4
+#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
+#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED         0x4
 #endif
-#ifndef NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME
-#define NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
+#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
+#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
 #endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND            0x0
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND            0x0
 #endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW        0x1
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW        0x1
 #endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY      0x2
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY      0x2
 #endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x4
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
 #endif
 
 
@@ -1686,7 +1686,7 @@ lt_int_dyld_lib_install_name (mh)
 {
 /* NSAddImage is also used to get the loaded image, but it only works if the lib
    is installed, for uninstalled libs we need to check the install_names against
-   each other. Note that this is still broken if DYLD_IMAGNUNET_GESUFFIX is set and a
+   each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
    different lib was loaded as a result
 */
   int j;
@@ -1761,18 +1761,18 @@ lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh)
                     ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
                                                dylib.name.offset +
                                                (unsigned long) lc),
-                                     NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED
+                                     NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
                                      +
-                                     NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING +
-                                     NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+                                     NSADDIMAGE_OPTION_WITH_SEARCHING +
+                                     NSADDIMAGE_OPTION_RETURN_ON_ERROR);
                 }
               if (mh1)
                 {
                   retSym = ltdl_NSLookupSymbolInImage (mh1,
                                                        symbol,
-                                                       NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
+                                                       NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
                                                        |
-                                                       NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+                                                       NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
                   if (retSym)
                     break;
                 }
@@ -1839,7 +1839,7 @@ sys_dyld_open (loader_data, filename)
         {
           module =
             (lt_module) ltdl_NSAddImage (filename,
-                                         NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+                                         NSADDIMAGE_OPTION_RETURN_ON_ERROR);
           break;
         }
     default:
@@ -1928,9 +1928,9 @@ sys_dyld_sym (loader_data, module, symbol)
               nssym =
                 ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
                                             symbol,
-                                            NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
+                                            NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
                                             |
-                                            NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+                                            NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
             }
         }