* libltdl/ltdl.c (lt_dlopen): some preprocessors choke if the `#'

of `#define' is not in column 1; let's go back to fortran! :-)
Add #undefs too, to avoid potential warnings or errors.

diff --git a/ChangeLog b/ChangeLog
index ca01d351ccfeb90e28395b20c9c81ec309ab8b27..9c51f170292792568fd14c7346ae5bd4fa08d422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libltdl/ltdl.c (lt_dlopen): some preprocessors choke if the `#'
+       of `#define' is not in column 1; let's go back to fortran! :-)
+       Add #undefs too, to avoid potential warnings or errors.
+
 1999-03-09  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE):

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index b05150694ca8f7d248e6314e096731d2f8c96d5d..8bf16a7cd281f8676df58c579f7734d38bd38d40 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1142,31 +1142,35 @@ lt_dlopen (filename)
                }
                /* read the .la file */
                while (!feof(file)) {
-                       #define STR_DLNAME      "dlname="
-                       #define STR_OLD_LIBRARY "old_library="
-                       #define STR_LIBDIR      "libdir="
-                       #define STR_DL_DEPLIBS  "dl_dependency_libs="
                        char    line[LTDL_FILENAME_MAX];
                        
                        if (!fgets(line, sizeof(line), file))
                                break;
                        if (line[0] == '\n' || line[0] == '#')
                                continue;
+#                      undef  STR_DLNAME
+#                      define STR_DLNAME       "dlname="
                        if (strncmp(line, STR_DLNAME,
                                sizeof(STR_DLNAME) - 1) == 0)
                                error = trim(&dlname,
                                        &line[sizeof(STR_DLNAME) - 1]);
                        else
+#                      undef  STR_OLD_LIBRARY
+#                      define STR_OLD_LIBRARY  "old_library="
                        if (strncmp(line, STR_OLD_LIBRARY,
                                sizeof(STR_OLD_LIBRARY) - 1) == 0)
                                error = trim(&old_name,
                                        &line[sizeof(STR_OLD_LIBRARY) - 1]);
                        else
+#                      undef  STR_LIBDIR
+#                      define STR_LIBDIR       "libdir="
                        if (strncmp(line, STR_LIBDIR,
                                sizeof(STR_LIBDIR) - 1) == 0)
                                error = trim(&libdir,
                                        &line[sizeof(STR_LIBDIR) - 1]);
                        else
+#                      undef  STR_DL_DEPLIBS
+#                      define STR_DL_DEPLIBS   "dl_dependency_libs="
                        if (strncmp(line, STR_DL_DEPLIBS,
                                sizeof(STR_DL_DEPLIBS) - 1) == 0)
                                error = trim(&deplibs,