* libltdl/ltdl.c: Move LT__UNUSED before parameter name, for g++

3.2.3 (on MinGW).
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/load_add_on.c, libltdl/loaders/loadlibrary.c,
libltdl/loaders/preopen.c, libltdl/loaders/shl_load.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 73ad66038139c1b493d71a78c6b7ef482ebfeef4..211075e913d4e4d763283f3ffc3b5e903a3cc32c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-04  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/ltdl.c: Move LT__UNUSED before parameter name, for g++
+       3.2.3 (on MinGW).
+       * libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
+       libltdl/loaders/load_add_on.c, libltdl/loaders/loadlibrary.c,
+       libltdl/loaders/preopen.c, libltdl/loaders/shl_load.c: Likewise.
+
 2006-09-04  George Bosilca <bosilca@cs.utk.edu>
        and Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 

diff --git a/libltdl/loaders/dld_link.c b/libltdl/loaders/dld_link.c
index c7b283e23b1c7011b4cf869b4a9440f7a58923b1..3fce60d50d3f3abf090fb93eaf5036603c34d63a 100644 (file)
--- a/libltdl/loaders/dld_link.c
+++ b/libltdl/loaders/dld_link.c
@@ -93,7 +93,7 @@ get_vtable (lt_user_data loader_data)
    loader.  Returns an opaque representation of the newly opened
    module for processing with this loader's other vtable functions.  */
 static lt_module
-vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
+vm_open (lt_user_data LT__UNUSED loader_data, const char *filename)
 {
   lt_module module = lt__strdup (filename);
 
@@ -109,7 +109,7 @@ vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
 /* A function called through the vtable when a particular module
    should be unloaded.  */
 static int
-vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
+vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
 {
   int errors = 0;
 
@@ -129,7 +129,7 @@ vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
 /* A function called through the vtable to get the address of
    a symbol loaded from a particular module.  */
 static void *
-vm_sym (lt_user_data loader_data LT__UNUSED, lt_module module LT__UNUSED,
+vm_sym (lt_user_data LT__UNUSED loader_data, lt_module LT__UNUSED module,
        const char *name)
 {
   void *address = dld_get_func (name);

diff --git a/libltdl/loaders/dlopen.c b/libltdl/loaders/dlopen.c
index 3bd5bd3f7cf85693f9b2fc71b3980bb1ef9e5909..860d53759c989ff0486eea0258fbaaf7bb0afa36 100644 (file)
--- a/libltdl/loaders/dlopen.c
+++ b/libltdl/loaders/dlopen.c
@@ -134,7 +134,7 @@ get_vtable (lt_user_data loader_data)
    loader.  Returns an opaque representation of the newly opened
    module for processing with this loader's other vtable functions.  */
 static lt_module
-vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
+vm_open (lt_user_data LT__UNUSED loader_data, const char *filename)
 {
   lt_module module = dlopen (filename, LT_LAZY_OR_NOW);
 
@@ -150,7 +150,7 @@ vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
 /* A function called through the vtable when a particular module
    should be unloaded.  */
 static int
-vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
+vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
 {
   int errors = 0;
 
@@ -167,7 +167,7 @@ vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
 /* A function called through the vtable to get the address of
    a symbol loaded from a particular module.  */
 static void *
-vm_sym (lt_user_data loader_data LT__UNUSED, lt_module module, const char *name)
+vm_sym (lt_user_data LT__UNUSED loader_data, lt_module module, const char *name)
 {
   void *address = dlsym (module, name);
 

diff --git a/libltdl/loaders/load_add_on.c b/libltdl/loaders/load_add_on.c
index 03a1557982d9e36d747fa9b86e7c4654f1ddcda0..c61e25a13d6a532b0d255526072e2458797765c1 100644 (file)
--- a/libltdl/loaders/load_add_on.c
+++ b/libltdl/loaders/load_add_on.c
@@ -91,7 +91,7 @@ get_vtable (lt_user_data loader_data)
    loader.  Returns an opaque representation of the newly opened
    module for processing with this loader's other vtable functions.  */
 static lt_module
-vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
+vm_open (lt_user_data LT__UNUSED loader_data, const char *filename)
 {
   image_id image = 0;
 
@@ -120,7 +120,7 @@ vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
 /* A function called through the vtable when a particular module
    should be unloaded.  */
 static int
-vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
+vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
 {
   int errors = 0;
 
@@ -137,7 +137,7 @@ vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
 /* A function called through the vtable to get the address of
    a symbol loaded from a particular module.  */
 static void *
-vm_sym (lt_user_data loader_data LT__UNUSED, lt_module module, const char *name)
+vm_sym (lt_user_data LT__UNUSED loader_data, lt_module module, const char *name)
 {
   void *address = 0;
   image_id image = (image_id) module;

diff --git a/libltdl/loaders/loadlibrary.c b/libltdl/loaders/loadlibrary.c
index 49a33ec6c05bb88de78853c2002a3683f1d0eb3c..d9bf4047c9995f001a2739d0283f7309d180799e 100644 (file)
--- a/libltdl/loaders/loadlibrary.c
+++ b/libltdl/loaders/loadlibrary.c
@@ -98,7 +98,7 @@ get_vtable (lt_user_data loader_data)
    loader.  Returns an opaque representation of the newly opened
    module for processing with this loader's other vtable functions.  */
 static lt_module
-vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
+vm_open (lt_user_data LT__UNUSED loader_data, const char *filename)
 {
   lt_module    module     = 0;
   char         *ext;
@@ -200,7 +200,7 @@ vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
 /* A function called through the vtable when a particular module
    should be unloaded.  */
 static int
-vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
+vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
 {
   int errors = 0;
 
@@ -217,7 +217,7 @@ vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
 /* A function called through the vtable to get the address of
    a symbol loaded from a particular module.  */
 static void *
-vm_sym (lt_user_data loader_data LT__UNUSED, lt_module module, const char *name)
+vm_sym (lt_user_data LT__UNUSED loader_data, lt_module module, const char *name)
 {
   void *address = (void *) GetProcAddress ((HMODULE) module, name);
 

diff --git a/libltdl/loaders/preopen.c b/libltdl/loaders/preopen.c
index dc2e9268063cfe415af9fee636cc148912ac0128..53942f1b8d369eb71f6869d6d5f81b085ff3ea41 100644 (file)
--- a/libltdl/loaders/preopen.c
+++ b/libltdl/loaders/preopen.c
@@ -110,7 +110,7 @@ static const        lt_dlsymlist   *default_preloaded_symbols       = 0;
 
 /* A function called through the vtable to initialise this loader.  */
 static int
-vl_init (lt_user_data loader_data LT__UNUSED)
+vl_init (lt_user_data LT__UNUSED loader_data)
 {
   int errors = 0;
 
@@ -127,7 +127,7 @@ vl_init (lt_user_data loader_data LT__UNUSED)
 /* A function called through the vtable when this loader is no
    longer needed by the application.  */
 static int
-vl_exit (lt_user_data loader_data LT__UNUSED)
+vl_exit (lt_user_data LT__UNUSED loader_data)
 {
   free_symlists ();
   return 0;
@@ -138,7 +138,7 @@ vl_exit (lt_user_data loader_data LT__UNUSED)
    loader.  Returns an opaque representation of the newly opened
    module for processing with this loader's other vtable functions.  */
 static lt_module
-vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
+vm_open (lt_user_data LT__UNUSED loader_data, const char *filename)
 {
   symlist_chain *lists;
   lt_module     module = 0;
@@ -190,7 +190,7 @@ vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
 /* A function called through the vtable when a particular module
    should be unloaded.  */
 static int
-vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
+vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
 {
   /* Just to silence gcc -Wall */
   module = 0;
@@ -201,7 +201,7 @@ vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
 /* A function called through the vtable to get the address of
    a symbol loaded from a particular module.  */
 static void *
-vm_sym (lt_user_data loader_data LT__UNUSED, lt_module module, const char *name)
+vm_sym (lt_user_data LT__UNUSED loader_data, lt_module module, const char *name)
 {
   lt_dlsymlist        *symbol = (lt_dlsymlist*) module;
 

diff --git a/libltdl/loaders/shl_load.c b/libltdl/loaders/shl_load.c
index e5d0e35f6972a8e028f115c21bca852fb548232e..1fb383f53fd5fc20802a9f333ff1a515b5cfd25d 100644 (file)
--- a/libltdl/loaders/shl_load.c
+++ b/libltdl/loaders/shl_load.c
@@ -134,7 +134,7 @@ get_vtable (lt_user_data loader_data)
    loader.  Returns an opaque representation of the newly opened
    module for processing with this loader's other vtable functions.  */
 static lt_module
-vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
+vm_open (lt_user_data LT__UNUSED loader_data, const char *filename)
 {
   static shl_t self = (shl_t) 0;
   lt_module module = shl_load (filename, LT_BIND_FLAGS, 0L);
@@ -169,7 +169,7 @@ vm_open (lt_user_data loader_data LT__UNUSED, const char *filename)
 /* A function called through the vtable when a particular module
    should be unloaded.  */
 static int
-vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
+vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
 {
   int errors = 0;
 
@@ -186,7 +186,7 @@ vm_close (lt_user_data loader_data LT__UNUSED, lt_module module)
 /* A function called through the vtable to get the address of
    a symbol loaded from a particular module.  */
 static void *
-vm_sym (lt_user_data loader_data LT__UNUSED, lt_module module, const char *name)
+vm_sym (lt_user_data LT__UNUSED loader_data, lt_module module, const char *name)
 {
   void *address = 0;
 

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 46badfb3ed89f8e901ccbabf9ed9620dbb53fc5d..b43d3d0f5cc63f7a8a305e1548260525c496be3e 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -689,7 +689,7 @@ find_file (const char *search_path, const char *base_name, char **pdir)
 }
 
 static int
-find_handle_callback (char *filename, void *data, void *ignored LT__UNUSED)
+find_handle_callback (char *filename, void *data, void * LT__UNUSED ignored)
 {
   lt_dlhandle  *handle         = (lt_dlhandle *) data;
   int          notfound        = access (filename, R_OK);
@@ -724,7 +724,7 @@ find_handle (const char *search_path, const char *base_name,
 
 #if !defined(LTDL_DLOPEN_DEPLIBS)
 static int
-load_deplibs (lt_dlhandle handle, char *deplibs LT__UNUSED)
+load_deplibs (lt_dlhandle handle, char * LT__UNUSED deplibs)
 {
   ((lt__handle *) handle)->depcount = 0;
   return 0;