* libltdl/ltdl.h (LTDL_PRELOADED_SYMBOLS): remove it; better to

	declare lt_preloaded_symbols
	* doc/libtool.texi (LTDL_PRELOADED_SYMBOLS): ditto

diff --git a/ChangeLog b/ChangeLog
index df9cbf915a7486d77a0f73c62e230bd721e40b51..dc080b4c86383f932398c4a38dcdfe0dd8932be4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-01-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * libltdl/ltdl.h (LTDL_PRELOADED_SYMBOLS): remove it; better to
+       declare lt_preloaded_symbols
+       * doc/libtool.texi (LTDL_PRELOADED_SYMBOLS): ditto
+
        * ltmain.in (dlpredeps): removed, reverting 1999-01-17's change
 
 1999-01-19  Alexandre Oliva  <oliva@dcc.unicamp.br>

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 0953acc954e6d73d564d58ab1942b4abfc48c4f6..4be0295389370888c27e54394995a32029f9a8b2 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2663,28 +2663,31 @@ are deleted. Return 0 on success.
 @end deftypefun
 
 @deftypefun int lt_dlpreload_default (const lt_dlsymlist *@var{preloaded})
-Set the default list of preloaded modules to @var{preloaded}, 
-which won't be deleted by @code{lt_dlpreload}.
-Note that this function does *not* require libltdl to be initialized
-using @code{lt_dlinit} and can be used in the program to register
-the default preloaded modules.
-Usually the main function in the program will set libtool's default
-symbol list:
+Set the default list of preloaded modules to @var{preloaded}, which
+won't be deleted by @code{lt_dlpreload}.  Note that this function does
+@emph{not} require libltdl to be initialized using @code{lt_dlinit} and
+can be used in the program to register the default preloaded modules.
+Instead of calling this function directly, most programs will use the
+macro @code{LTDL_SET_PRELOADED_SYMBOLS}.
 
-@example
-extern const lt_dlsymlist lt_preloaded_symbols[];
-
-...
+Return 0 on success.
+@end deftypefun
 
-lt_dlpreload_default(lt_preloaded_symbols);
-@end example
+@defmac LTDL_SET_PRELOADED_SYMBOLS()
+Set the default list of preloaded symbols.
+Should be used together with @code{LTDL_PRELOADED_SYMBOLS}
+in your program to initialize libltdl's list of preloaded modules.
 
-Libltdl defines the macros @code{LTDL_PRELOADED_SYMBOLS} and 
-@code{LTDL_SET_PRELOADED_SYMBOLS}, which hide these libtool dependent
-declaration for you.
+@example
+#include <ltdl.h>
 
-Return 0 on success.
-@end deftypefun
+int main() @{
+  /* ... */
+  LTDL_SET_PRELOADED_SYMBOLS();
+  /* ... */
+@}
+@end example
+@end defmac
 
 @deftypefun int lt_dladdsearchdir (const char *@var{search_dir})
 Add the search directory @var{search_dir} to the user-defined library 
@@ -2700,27 +2703,6 @@ Replace the current user-defined library search path with
 Return the current user-defined library search path.
 @end deftypefun
 
-@defmac LTDL_PRELOADED_SYMBOLS
-Import libtool's preloaded symbols.
-See @code{LTDL_SET_PRELOADED_SYMBOLS}.
-@end defmac
-
-@defmac LTDL_SET_PRELOADED_SYMBOLS()
-Set the default list of preloaded symbols.
-Should be used together with @code{LTDL_PRELOADED_SYMBOLS}
-in your program to initialize libltdl's list of preloaded modules.
-
-@example
-LTDL_PRELOADED_SYMBOLS;
-
-int main() @{
-...
-LTDL_SET_PRELOADED_SYMBOLS();
-...
-@}
-@end example
-@end defmac
-
 @node Modules for libltdl
 @section Creating modules that can be @code{dlopen}ed
 

diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index 1d0c0cbcd94aa414ff22d4766705d37ed8339789..dbe1a0e6524fe132d45a2f492cf5050f9d04d691 100644 (file)
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -86,7 +86,7 @@ _LTDLL_EXTERN int lt_dladdsearchdir __P((const char *search_dir));
 _LTDLL_EXTERN int lt_dlsetsearchpath __P((const char *search_path));
 _LTDLL_EXTERN const char *lt_dlgetsearchpath __P((void));
 
-#define LTDL_PRELOADED_SYMBOLS extern const lt_dlsymlist lt_preloaded_symbols[];
+extern const lt_dlsymlist lt_preloaded_symbols[];
 #define LTDL_SET_PRELOADED_SYMBOLS() lt_dlpreload_default(lt_preloaded_symbols)
 
 __END_DECLS