* demo/foo.h: s/PARAMS/LTDL_PARAMS/g

* libltdl/ltdl.h: ditto.
* libltdl/ltdl.c: ditto.

diff --git a/ChangeLog b/ChangeLog
index bfa2008b861dfb6ca329abb866cdec4780d1638a..dde4f4fff9e66f5daa59184d270cb26b68d1f0f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-05-21  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
+       * demo/foo.h: s/PARAMS/LTDL_PARAMS/g
+       * libltdl/ltdl.h: ditto.
+       * libltdl/ltdl.c: ditto.
+
        * demo/foo.h: s/__P/PARAMS/g
        * libltdl/ltdl.h: ditto.
        * libltdl/ltdl.c: ditto.

diff --git a/demo/foo.h b/demo/foo.h
index 410ee58839cd5a6edde7fca8801ee9edba8b225d..9cc61950fcc53a122f489ccff007ab84bba6b6a4 100644 (file)
--- a/demo/foo.h
+++ b/demo/foo.h
@@ -45,15 +45,15 @@ USA. */
 # define __END_DECLS /* empty */
 #endif
 
-/* PARAMS is a macro used to wrap function prototypes, so that compilers
+/* LTDL_PARAMS is a macro used to wrap function prototypes, so that compilers
    that don't understand ANSI C prototypes still work, and ANSI C
    compilers can issue warnings about type mismatches. */
-#undef PARAMS
+#undef LTDL_PARAMS
 #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(__CYGWIN32__) || defined(__cplusplus)
-# define PARAMS(protos) protos
+# define LTDL_PARAMS(protos) protos
 # define lt_ptr_t     void*
 #else
-# define PARAMS(protos) ()
+# define LTDL_PARAMS(protos) ()
 # define lt_ptr_t     char*
 #endif
 
@@ -82,8 +82,8 @@ USA. */
 
 /* Declarations.  Note the wonderful use of the above macros. */
 __BEGIN_DECLS
-int foo PARAMS((void));
-int hello PARAMS((void));
+int foo LTDL_PARAMS((void));
+int hello LTDL_PARAMS((void));
 EXTERN int nothing;
 __END_DECLS
 

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index f48d1bd5c5e6bb27eb4fa987693ba8e16078e7c2..ce37e27e95a23d3fec7310cbe191247785588874 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -104,17 +104,17 @@ const lt_dlsymlist lt_preloaded_symbols[1] = { { 0, 0 } };
 
 static const char *last_error = 0;
 
-lt_ptr_t (*lt_dlmalloc) PARAMS((size_t size)) = (lt_ptr_t(*)PARAMS((size_t)))malloc;
-void    (*lt_dlfree)  PARAMS((lt_ptr_t ptr)) = (void(*)PARAMS((lt_ptr_t)))free;
+lt_ptr_t (*lt_dlmalloc) LTDL_PARAMS((size_t size)) = (lt_ptr_t(*)LTDL_PARAMS((size_t)))malloc;
+void    (*lt_dlfree)  LTDL_PARAMS((lt_ptr_t ptr)) = (void(*)LTDL_PARAMS((lt_ptr_t)))free;
 
 typedef struct lt_dltype_t {
        struct lt_dltype_t *next;
        const char *sym_prefix; /* prefix for symbols */
-       int (*mod_init) PARAMS((void));
-       int (*mod_exit) PARAMS((void));
-       int (*lib_open) PARAMS((lt_dlhandle handle, const char *filename));
-       int (*lib_close) PARAMS((lt_dlhandle handle));
-       lt_ptr_t (*find_sym) PARAMS((lt_dlhandle handle, const char *symbol));
+       int (*mod_init) LTDL_PARAMS((void));
+       int (*mod_exit) LTDL_PARAMS((void));
+       int (*lib_open) LTDL_PARAMS((lt_dlhandle handle, const char *filename));
+       int (*lib_close) LTDL_PARAMS((lt_dlhandle handle));
+       lt_ptr_t (*find_sym) LTDL_PARAMS((lt_dlhandle handle, const char *symbol));
 } lt_dltype_t;
 
 #define LTDL_TYPE_TOP 0
@@ -246,13 +246,13 @@ strrchr(str, ch)
 #endif
 
 static int
-sys_dl_init PARAMS((void))
+sys_dl_init LTDL_PARAMS((void))
 {
        return 0;
 }
 
 static int
-sys_dl_exit PARAMS((void))
+sys_dl_exit LTDL_PARAMS((void))
 {
        return 0;
 }
@@ -364,13 +364,13 @@ sys_dl = { LTDL_TYPE_TOP, 0, sys_dl_init, sys_dl_exit,
 #define        LTDL_BIND_FLAGS (BIND_IMMEDIATE | BIND_NONFATAL | BIND_VERBOSE | DYNAMIC_PATH)
 
 static int
-sys_shl_init PARAMS((void))
+sys_shl_init LTDL_PARAMS((void))
 {
        return 0;
 }
 
 static int
-sys_shl_exit PARAMS((void))
+sys_shl_exit LTDL_PARAMS((void))
 {
        return 0;
 }
@@ -433,13 +433,13 @@ sys_shl = { LTDL_TYPE_TOP, 0, sys_shl_init, sys_shl_exit,
 #endif
 
 static int
-sys_dld_init PARAMS((void))
+sys_dld_init LTDL_PARAMS((void))
 {
        return 0;
 }
 
 static int
-sys_dld_exit PARAMS((void))
+sys_dld_exit LTDL_PARAMS((void))
 {
        return 0;
 }
@@ -503,13 +503,13 @@ sys_dld = { LTDL_TYPE_TOP, 0, sys_dld_init, sys_dld_exit,
 #include <windows.h>
 
 static int
-sys_wll_init PARAMS((void))
+sys_wll_init LTDL_PARAMS((void))
 {
        return 0;
 }
 
 static int
-sys_wll_exit PARAMS((void))
+sys_wll_exit LTDL_PARAMS((void))
 {
        return 0;
 }
@@ -567,13 +567,13 @@ sys_wll = { LTDL_TYPE_TOP, 0, sys_wll_init, sys_wll_exit,
 #include <kernel/image.h>
 
 static int
-sys_bedl_init PARAMS((void))
+sys_bedl_init LTDL_PARAMS((void))
 {
        return 0;
 }
 
 static int
-sys_bedl_exit PARAMS((void))
+sys_bedl_exit LTDL_PARAMS((void))
 {
        return 0;
 }
@@ -649,7 +649,7 @@ static const lt_dlsymlist *default_preloaded_symbols = 0;
 static lt_dlsymlists_t *preloaded_symbols = 0;
 
 static int
-presym_init PARAMS((void))
+presym_init LTDL_PARAMS((void))
 {
        preloaded_symbols = 0;
        if (default_preloaded_symbols)
@@ -658,7 +658,7 @@ presym_init PARAMS((void))
 }
 
 static int
-presym_free_symlists PARAMS((void))
+presym_free_symlists LTDL_PARAMS((void))
 {
        lt_dlsymlists_t *lists = preloaded_symbols;
        
@@ -673,7 +673,7 @@ presym_free_symlists PARAMS((void))
 }
 
 static int
-presym_exit PARAMS((void))
+presym_exit LTDL_PARAMS((void))
 {
        presym_free_symlists();
        return 0;
@@ -783,7 +783,7 @@ static lt_dltype_t *types = LTDL_TYPE_TOP;
 #undef LTDL_TYPE_TOP
 
 int
-lt_dlinit PARAMS((void))
+lt_dlinit LTDL_PARAMS((void))
 {
        /* initialize libltdl */
        lt_dltype_t **type = &types;
@@ -834,7 +834,7 @@ lt_dlpreload_default (preloaded)
 }
 
 int
-lt_dlexit PARAMS((void))
+lt_dlexit LTDL_PARAMS((void))
 {
        /* shut down libltdl */
        lt_dltype_t *type = types;
@@ -1518,7 +1518,7 @@ lt_dlsym (handle, symbol)
 }
 
 const char *
-lt_dlerror PARAMS((void))
+lt_dlerror LTDL_PARAMS((void))
 {
        const char *error = last_error;
        
@@ -1571,7 +1571,7 @@ lt_dlsetsearchpath (search_path)
 }
 
 const char *
-lt_dlgetsearchpath PARAMS((void))
+lt_dlgetsearchpath LTDL_PARAMS((void))
 {
        return user_search_path;
 }

diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index fe4b41e19d0aeff65c7e5b68ea08e43ae8f23790..bebbc6d2f8557e84ada39544fb9453fb056390a3 100644 (file)
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -40,16 +40,16 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # define __END_DECLS /* empty */
 #endif
 
-/* PARAMS is a macro used to wrap function prototypes, so that compilers
+/* LTDL_PARAMS is a macro used to wrap function prototypes, so that compilers
    that don't understand ANSI C prototypes still work, and ANSI C
    compilers can issue warnings about type mismatches. */
-#undef PARAMS
+#undef LTDL_PARAMS
 #undef lt_ptr_t
 #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
-# define PARAMS(protos)        protos
+# define LTDL_PARAMS(protos)   protos
 # define lt_ptr_t      void*
 #else
-# define PARAMS(protos)        ()
+# define LTDL_PARAMS(protos)   ()
 # define lt_ptr_t      char*
 #endif
 
@@ -67,24 +67,24 @@ typedef struct {
 } lt_dlsymlist;
 
 __BEGIN_DECLS
-extern int lt_dlinit PARAMS((void));
-extern int lt_dlpreload PARAMS((const lt_dlsymlist *preloaded));
-extern int lt_dlpreload_default PARAMS((const lt_dlsymlist *preloaded));
-extern int lt_dlexit PARAMS((void));
-extern lt_dlhandle lt_dlopen PARAMS((const char *filename));
-extern lt_dlhandle lt_dlopenext PARAMS((const char *filename));
-extern int lt_dlclose PARAMS((lt_dlhandle handle));
-extern lt_ptr_t lt_dlsym PARAMS((lt_dlhandle handle, const char *name));
-extern const char *lt_dlerror PARAMS((void));
-extern int lt_dladdsearchdir PARAMS((const char *search_dir));
-extern int lt_dlsetsearchpath PARAMS((const char *search_path));
-extern const char *lt_dlgetsearchpath PARAMS((void));
+extern int lt_dlinit LTDL_PARAMS((void));
+extern int lt_dlpreload LTDL_PARAMS((const lt_dlsymlist *preloaded));
+extern int lt_dlpreload_default LTDL_PARAMS((const lt_dlsymlist *preloaded));
+extern int lt_dlexit LTDL_PARAMS((void));
+extern lt_dlhandle lt_dlopen LTDL_PARAMS((const char *filename));
+extern lt_dlhandle lt_dlopenext LTDL_PARAMS((const char *filename));
+extern int lt_dlclose LTDL_PARAMS((lt_dlhandle handle));
+extern lt_ptr_t lt_dlsym LTDL_PARAMS((lt_dlhandle handle, const char *name));
+extern const char *lt_dlerror LTDL_PARAMS((void));
+extern int lt_dladdsearchdir LTDL_PARAMS((const char *search_dir));
+extern int lt_dlsetsearchpath LTDL_PARAMS((const char *search_path));
+extern const char *lt_dlgetsearchpath LTDL_PARAMS((void));
 
 extern const lt_dlsymlist lt_preloaded_symbols[];
 #define LTDL_SET_PRELOADED_SYMBOLS() lt_dlpreload_default(lt_preloaded_symbols)
 
-extern lt_ptr_t (*lt_dlmalloc)PARAMS((size_t size));
-extern void (*lt_dlfree)PARAMS((lt_ptr_t ptr));
+extern lt_ptr_t (*lt_dlmalloc)LTDL_PARAMS((size_t size));
+extern void (*lt_dlfree)LTDL_PARAMS((lt_ptr_t ptr));
 
 __END_DECLS