Thu 08 May 2008 04:44:46 AM UTC, comment #2:
or a patch for the libltdl folder:
diff -urd gnash.old/libltdl/argz_.h gnash.new/libltdl/argz_.h
--- gnash.old/libltdl/argz_.h 2008-05-07 23:29:13.957254157 -0500
+++ gnash.new/libltdl/argz_.h 2008-05-07 22:59:06.509255000 -0500
@@ -47,18 +47,18 @@
extern "C" {
#endif
-LT_SCOPE error_t argz_append (char *pargz, size_t pargz_len,
+extern error_t argz_append (char *pargz, size_t pargz_len,
const char *buf, size_t buf_len);
-LT_SCOPE error_t argz_add (char *pargz, size_t pargz_len,
+extern error_t argz_add (char *pargz, size_t pargz_len,
const char *str);
-LT_SCOPE error_t argz_create_sep(const char *str, int delim,
+extern error_t argz_create_sep(const char *str, int delim,
char *pargz, size_t pargz_len);
-LT_SCOPE error_t argz_insert (char *pargz, size_t pargz_len,
+extern error_t argz_insert (char *pargz, size_t pargz_len,
char before, const char entry);
-LT_SCOPE char argz_next (char argz, size_t argz_len,
+extern char argz_next (char argz, size_t argz_len,
const char *entry);
-LT_SCOPE void argz_stringify (char *argz, size_t argz_len, int sep);
-LT_SCOPE size_t argz_count (const char *argz, size_t argz_len);
+extern void argz_stringify (char *argz, size_t argz_len, int sep);
+extern size_t argz_count (const char *argz, size_t argz_len);
#if defined(__cplusplus)
}
diff -urd gnash.old/libltdl/config.h gnash.new/libltdl/config.h
--- gnash.old/libltdl/config.h 2008-05-07 23:30:17.643254123 -0500
+++ gnash.new/libltdl/config.h 2008-05-07 23:07:28.428004000 -0500
@@ -2,6 +2,7 @@
/* config-h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the `argz_add' function. */
+#define LT_SCOPE extern
#define HAVE_ARGZ_ADD 1
/* Define to 1 if you have the `argz_append' function. */
diff -urd gnash.old/libltdl/config.log gnash.new/libltdl/config.log
--- gnash.old/libltdl/config.log 2008-05-07 23:30:17.855268570 -0500
+++ gnash.new/libltdl/config.log 2008-05-07 22:30:35.680018000 -0500
@@ -293,7 +293,7 @@
configure:10226: result: immediate
configure:10345: checking for shl_load
configure:10401: x86_64-pc-linux-gnu-gcc -o conftest -O3 -march=nocona -fomit-frame-pointer -fexpensive-optimizations -pipe -Wl,-O1 -Wl,--as-needed -Wl,-L/usr/kde/3.5/lib64 -lkdeui -I/usr/share/libtool/libltdl/libltdl conftest.c >&5
diff -urd gnash.old/libltdl/libltdl/lt__alloc.h gnash.new/libltdl/libltdl/lt__alloc.h
--- gnash.old/libltdl/libltdl/lt__alloc.h 2008-05-07 23:29:14.178254172 -0500
+++ gnash.new/libltdl/libltdl/lt__alloc.h 2008-05-07 23:10:18.531254000 -0500
@@ -44,14 +44,14 @@
} LT_STMT_END
/* If set, this function is called when memory allocation has failed. */
-LT_SCOPE void (*lt__alloc_die) (void);
+extern void (*lt__alloc_die) (void);
-LT_SCOPE void *lt__malloc (size_t n);
-LT_SCOPE void *lt__zalloc (size_t n);
-LT_SCOPE void lt__realloc (void mem, size_t n);
-LT_SCOPE void lt__memdup (void const mem, size_t n);
+extern void *lt__malloc (size_t n);
+extern void *lt__zalloc (size_t n);
+extern void lt__realloc (void mem, size_t n);
+extern void lt__memdup (void const mem, size_t n);
-LT_SCOPE char lt__strdup (const char string);
+extern char lt__strdup (const char string);
LT_END_C_DECLS
diff -urd gnash.old/libltdl/libltdl/lt__dirent.h gnash.new/libltdl/libltdl/lt__dirent.h
--- gnash.old/libltdl/libltdl/lt__dirent.h 2008-05-07 23:29:14.197269158 -0500
+++ gnash.new/libltdl/libltdl/lt__dirent.h 2008-05-07 23:10:18.531254000 -0500
@@ -34,7 +34,7 @@
#if defined(LT_CONFIG_H)
# include LT_CONFIG_H
#else
-# include <config.h>
+# include "../config.h"
#endif
#include "lt_system.h"
@@ -74,9 +74,9 @@
} DIR;
-LT_SCOPE DIR opendir (const char path);
-LT_SCOPE struct dirent readdir (DIR entry);
-LT_SCOPE void closedir (DIR *entry);
+extern DIR opendir (const char path);
+extern struct dirent readdir (DIR entry);
+extern void closedir (DIR *entry);
LT_END_C_DECLS
diff -urd gnash.old/libltdl/libltdl/lt_dlloader.h gnash.new/libltdl/libltdl/lt_dlloader.h
--- gnash.old/libltdl/libltdl/lt_dlloader.h 2008-05-07 23:29:14.312254583 -0500
+++ gnash.new/libltdl/libltdl/lt_dlloader.h 2008-05-07 23:10:18.531254000 -0500
@@ -70,19 +70,19 @@
lt_dlloader_priority priority;
} lt_dlvtable;
-LT_SCOPE int lt_dlloader_add (const lt_dlvtable *vtable);
-LT_SCOPE lt_dlloader lt_dlloader_next (const lt_dlloader loader);
+extern int lt_dlloader_add (const lt_dlvtable *vtable);
+extern lt_dlloader lt_dlloader_next (const lt_dlloader loader);
-LT_SCOPE lt_dlvtable lt_dlloader_remove (char name);
-LT_SCOPE const lt_dlvtable lt_dlloader_find (char name);
-LT_SCOPE const lt_dlvtable *lt_dlloader_get (lt_dlloader loader);
+extern lt_dlvtable lt_dlloader_remove (char name);
+extern const lt_dlvtable lt_dlloader_find (char name);
+extern const lt_dlvtable *lt_dlloader_get (lt_dlloader loader);
/* Type of a function to get a loader's vtable: */
typedef const lt_dlvtable *lt_get_vtable (lt_user_data data);
#ifdef LT_DEBUG_LOADERS
-LT_SCOPE void lt_dlloader_dump (void);
+extern void lt_dlloader_dump (void);
#endif
LT_END_C_DECLS
diff -urd gnash.old/libltdl/libltdl/lt_error.h gnash.new/libltdl/libltdl/lt_error.h
--- gnash.old/libltdl/libltdl/lt_error.h 2008-05-07 23:29:14.352254359 -0500
+++ gnash.new/libltdl/libltdl/lt_error.h 2008-05-07 23:10:18.532254000 -0500
@@ -76,8 +76,8 @@
#define LT_ERROR_LEN_MAX (41)
/* These functions are only useful from inside custom module loaders. */
-LT_SCOPE int lt_dladderror (const char *diagnostic);
-LT_SCOPE int lt_dlseterror (int errorcode);
+extern int lt_dladderror (const char *diagnostic);
+extern int lt_dlseterror (int errorcode);
LT_END_C_DECLS
diff -urd gnash.old/libltdl/libltdl/lt__glibc.h gnash.new/libltdl/libltdl/lt__glibc.h
--- gnash.old/libltdl/libltdl/lt__glibc.h 2008-05-07 23:29:14.217269605 -0500
+++ gnash.new/libltdl/libltdl/lt__glibc.h 2008-05-07 23:10:18.532254000 -0500
@@ -34,7 +34,7 @@
#if defined(LT_CONFIG_H)
# include LT_CONFIG_H
#else
-# include <config.h>
+# include "../config.h"
#endif
#if !defined(HAVE_ARGZ_H) || !defined(HAVE_WORKING_ARGZ)
@@ -78,6 +78,6 @@
# define slist_box lt__slist_box
# define slist_unbox lt__slist_unbox
-#include <slist.h>
+#include "slist.h"
#endif /!defined(LT__GLIBC_H)/
diff -urd gnash.old/libltdl/libltdl/lt__private.h gnash.new/libltdl/libltdl/lt__private.h
--- gnash.old/libltdl/libltdl/lt__private.h 2008-05-07 23:29:14.241254078 -0500
+++ gnash.new/libltdl/libltdl/lt__private.h 2008-05-07 23:10:18.533253000 -0500
@@ -34,7 +34,7 @@
#if defined(LT_CONFIG_H)
# include LT_CONFIG_H
#else
-# include <config.h>
+# include "../config.h"
#endif
#include <stdio.h>
@@ -54,7 +54,7 @@
#include "lt__glibc.h"
/* ...and all exported interfaces. */
-#include "ltdl.h"
+#include "../ltdl.h"
#if defined(WITH_DMALLOC)
# include <dmalloc.h>
@@ -90,7 +90,7 @@
extern int errno;
#endif
-LT_SCOPE void lt__alloc_die_callback (void);
+extern void lt__alloc_die_callback (void);
/* For readability: */
@@ -139,9 +139,9 @@
#define LT__SETERRORSTR(errormsg) lt__set_last_error(errormsg)
#define LT__SETERROR(errorcode) LT__SETERRORSTR(LT__STRERROR(errorcode))
-LT_SCOPE const char *lt__error_string (int errorcode);
-LT_SCOPE const char *lt__get_last_error (void);
-LT_SCOPE const char lt__set_last_error (const char errormsg);
+extern const char *lt__error_string (int errorcode);
+extern const char *lt__get_last_error (void);
+extern const char lt__set_last_error (const char errormsg);
LT_END_C_DECLS
diff -urd gnash.old/libltdl/libltdl/lt__strl.h gnash.new/libltdl/libltdl/lt__strl.h
--- gnash.old/libltdl/libltdl/lt__strl.h 2008-05-07 23:29:14.278255150 -0500
+++ gnash.new/libltdl/libltdl/lt__strl.h 2008-05-07 23:10:18.533253000 -0500
@@ -34,7 +34,7 @@
#if defined(LT_CONFIG_H)
# include LT_CONFIG_H
#else
-# include <config.h>
+# include "../config.h"
#endif
#include <string.h>
@@ -42,12 +42,12 @@
#if !defined(HAVE_STRLCAT)
# define strlcat(dst,src,dstsize) lt_strlcat(dst,src,dstsize)
-LT_SCOPE size_t lt_strlcat(char dst, const char src, const size_t dstsize);
+extern size_t lt_strlcat(char dst, const char src, const size_t dstsize);
#endif /* !defined(HAVE_STRLCAT) */
#if !defined(HAVE_STRLCPY)
# define strlcpy(dst,src,dstsize) lt_strlcpy(dst,src,dstsize)
-LT_SCOPE size_t lt_strlcpy(char dst, const char src, const size_t dstsize);
+extern size_t lt_strlcpy(char dst, const char src, const size_t dstsize);
#endif /* !defined(HAVE_STRLCPY) */
#endif /!defined(LT__STRL_H)/
diff -urd gnash.old/libltdl/libltdl/slist.h gnash.new/libltdl/libltdl/slist.h
--- gnash.old/libltdl/libltdl/slist.h 2008-05-07 23:29:14.390256186 -0500
+++ gnash.new/libltdl/libltdl/slist.h 2008-05-07 23:10:18.534254000 -0500
@@ -45,7 +45,7 @@
# include <libltdl/lt__glibc.h>
# include <libltdl/lt_system.h>
#else
-# define LT_SCOPE
+# define LT_SCOPE extern
#endif
#if defined(__cplusplus)
@@ -61,27 +61,27 @@
typedef int SListCompare (const SList item1, const SList item2,
void *userdata);
-LT_SCOPE SList slist_concat (SList head, SList *tail);
-LT_SCOPE SList slist_cons (SList item, SList *slist);
+extern SList slist_concat (SList head, SList *tail);
+extern SList slist_cons (SList item, SList *slist);
-LT_SCOPE SList slist_delete (SList slist, void (delete_fct) (void item));
-LT_SCOPE void slist_remove (SList phead, SListCallback find,
+extern SList slist_delete (SList slist, void (delete_fct) (void item));
+extern void slist_remove (SList phead, SListCallback find,
void *matchdata);
-LT_SCOPE SList slist_reverse (SList slist);
-LT_SCOPE SList slist_sort (SList slist, SListCompare *compare,
+extern SList slist_reverse (SList slist);
+extern SList slist_sort (SList slist, SListCompare *compare,
void *userdata);
-LT_SCOPE SList slist_tail (SList slist);
-LT_SCOPE SList slist_nth (SList slist, size_t n);
-LT_SCOPE void slist_find (SList slist, SListCallback *find,
+extern SList slist_tail (SList slist);
+extern SList slist_nth (SList slist, size_t n);
+extern void slist_find (SList slist, SListCallback *find,
void *matchdata);
-LT_SCOPE size_t slist_length (SList *slist);
+extern size_t slist_length (SList *slist);
-LT_SCOPE void slist_foreach (SList slist, SListCallback *foreach,
+extern void slist_foreach (SList slist, SListCallback *foreach,
void *userdata);
-LT_SCOPE SList slist_box (const void userdata);
-LT_SCOPE void slist_unbox (SList item);
+extern SList slist_box (const void userdata);
+extern void slist_unbox (SList item);
#if defined(__cplusplus)
}
diff -urd gnash.old/libltdl/ltdl.c gnash.new/libltdl/ltdl.c
--- gnash.old/libltdl/ltdl.c 2008-05-07 23:29:14.559254202 -0500
+++ gnash.new/libltdl/ltdl.c 2008-05-07 23:12:00.911003000 -0500
@@ -29,9 +29,9 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "lt__private.h"
-#include "lt_system.h"
-#include "lt_dlloader.h"
+#include "libltdl/lt__private.h"
+#include "libltdl/lt_system.h"
+#include "libltdl/lt_dlloader.h"
/* --- MANIFEST CONSTANTS --- */
@@ -200,7 +200,7 @@
#define preloaded_symbols LT_CONC3(lt_, LTDLOPEN, _LTX_preloaded_symbols)
LT_BEGIN_C_DECLS
-LT_SCOPE const lt_dlvtable * get_vtable (lt_user_data data);
+extern const lt_dlvtable * get_vtable (lt_user_data data);
LT_END_C_DECLS
#ifdef HAVE_LIBDLLOADER
extern lt_dlsymlist preloaded_symbols;
diff -urd gnash.old/libltdl/ltdl.h gnash.new/libltdl/ltdl.h
--- gnash.old/libltdl/ltdl.h 2008-05-07 23:29:14.525254699 -0500
+++ gnash.new/libltdl/ltdl.h 2008-05-07 23:12:00.911003000 -0500
@@ -33,9 +33,9 @@
#if !defined(LTDL_H)
#define LTDL_H 1
-#include <libltdl/lt_system.h>
-#include <libltdl/lt_error.h>
-#include <libltdl/lt_dlloader.h>
+#include "libltdl/lt_system.h"
+#include "libltdl/lt_error.h"
+#include "libltdl/lt_dlloader.h"
LT_BEGIN_C_DECLS
@@ -50,36 +50,36 @@
typedef struct lt__handle lt_dlhandle; / A loaded module. */
/* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE int lt_dlinit (void);
-LT_SCOPE int lt_dlexit (void);
+extern int lt_dlinit (void);
+extern int lt_dlexit (void);
/* Module search path manipulation. */
-LT_SCOPE int lt_dladdsearchdir (const char *search_dir);
-LT_SCOPE int lt_dlinsertsearchdir (const char *before,
+extern int lt_dladdsearchdir (const char *search_dir);
+extern int lt_dlinsertsearchdir (const char *before,
const char *search_dir);
-LT_SCOPE int lt_dlsetsearchpath (const char *search_path);
-LT_SCOPE const char *lt_dlgetsearchpath (void);
-LT_SCOPE int lt_dlforeachfile (
+extern int lt_dlsetsearchpath (const char *search_path);
+extern const char *lt_dlgetsearchpath (void);
+extern int lt_dlforeachfile (
const char *search_path,
int (func) (const char filename, void *data),
void *data);
/* User module loading advisors. */
-LT_SCOPE int lt_dladvise_init (lt_dladvise *advise);
-LT_SCOPE int lt_dladvise_destroy (lt_dladvise *advise);
-LT_SCOPE int lt_dladvise_ext (lt_dladvise *advise);
-LT_SCOPE int lt_dladvise_resident (lt_dladvise *advise);
-LT_SCOPE int lt_dladvise_local (lt_dladvise *advise);
-LT_SCOPE int lt_dladvise_global (lt_dladvise *advise);
+extern int lt_dladvise_init (lt_dladvise *advise);
+extern int lt_dladvise_destroy (lt_dladvise *advise);
+extern int lt_dladvise_ext (lt_dladvise *advise);
+extern int lt_dladvise_resident (lt_dladvise *advise);
+extern int lt_dladvise_local (lt_dladvise *advise);
+extern int lt_dladvise_global (lt_dladvise *advise);
/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE lt_dlhandle lt_dlopen (const char *filename);
-LT_SCOPE lt_dlhandle lt_dlopenext (const char *filename);
-LT_SCOPE lt_dlhandle lt_dlopenadvise (const char *filename,
+extern lt_dlhandle lt_dlopen (const char *filename);
+extern lt_dlhandle lt_dlopenext (const char *filename);
+extern lt_dlhandle lt_dlopenadvise (const char *filename,
lt_dladvise advise);
-LT_SCOPE void lt_dlsym (lt_dlhandle handle, const char name);
-LT_SCOPE const char *lt_dlerror (void);
-LT_SCOPE int lt_dlclose (lt_dlhandle handle);
+extern void lt_dlsym (lt_dlhandle handle, const char name);
+extern const char *lt_dlerror (void);
+extern int lt_dlclose (lt_dlhandle handle);
@@ -95,9 +95,9 @@
typedef int lt_dlpreload_callback_func (lt_dlhandle handle);
-LT_SCOPE int lt_dlpreload (const lt_dlsymlist *preloaded);
-LT_SCOPE int lt_dlpreload_default (const lt_dlsymlist *preloaded);
-LT_SCOPE int lt_dlpreload_open (const char *originator,
+extern int lt_dlpreload (const lt_dlsymlist *preloaded);
+extern int lt_dlpreload_default (const lt_dlsymlist *preloaded);
+extern int lt_dlpreload_open (const char *originator,
lt_dlpreload_callback_func *func);
#define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
@@ -116,12 +116,12 @@
typedef void * lt_dlinterface_id;
typedef int lt_dlhandle_interface (lt_dlhandle handle, const char *id_string);
-LT_SCOPE lt_dlinterface_id lt_dlinterface_register (const char *id_string,
+extern lt_dlinterface_id lt_dlinterface_register (const char *id_string,
lt_dlhandle_interface *iface);
-LT_SCOPE void lt_dlinterface_free (lt_dlinterface_id key);
-LT_SCOPE void * lt_dlcaller_set_data (lt_dlinterface_id key,
+extern void lt_dlinterface_free (lt_dlinterface_id key);
+extern void * lt_dlcaller_set_data (lt_dlinterface_id key,
lt_dlhandle handle, void *data);
-LT_SCOPE void * lt_dlcaller_get_data (lt_dlinterface_id key,
+extern void * lt_dlcaller_get_data (lt_dlinterface_id key,
lt_dlhandle handle);
@@ -138,21 +138,21 @@
locally. */
} lt_dlinfo;
-LT_SCOPE const lt_dlinfo *lt_dlgetinfo (lt_dlhandle handle);
+extern const lt_dlinfo *lt_dlgetinfo (lt_dlhandle handle);
-LT_SCOPE lt_dlhandle lt_dlhandle_iterate (lt_dlinterface_id iface,
+extern lt_dlhandle lt_dlhandle_iterate (lt_dlinterface_id iface,
lt_dlhandle place);
-LT_SCOPE lt_dlhandle lt_dlhandle_fetch (lt_dlinterface_id iface,
+extern lt_dlhandle lt_dlhandle_fetch (lt_dlinterface_id iface,
const char *module_name);
-LT_SCOPE int lt_dlhandle_map (lt_dlinterface_id iface,
+extern int lt_dlhandle_map (lt_dlinterface_id iface,
int (func) (lt_dlhandle handle, void data),
void *data);
/* Deprecated module residency management API. */
-LT_SCOPE int lt_dlmakeresident (lt_dlhandle handle);
-LT_SCOPE int lt_dlisresident (lt_dlhandle handle);
+extern int lt_dlmakeresident (lt_dlhandle handle);
+extern int lt_dlisresident (lt_dlhandle handle);
#define lt_ptr void *
|