[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: libtool--gary--1.0--patch-8
|
From: |
Gary V. Vaughan |
|
Subject: |
FYI: libtool--gary--1.0--patch-8 |
|
Date: |
Tue, 13 Apr 2004 16:25:34 +0100 (BST) |
|
User-agent: |
mailnotify/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)
iD8DBQFAfAZtFRMICSmD1gYRApPbAJ9ORuEWwf0oyjEyBUvYankjwLV0qACgxJq6
+KgH493q1Cf3SLMDPQbV49g=
=krd9
-----END PGP SIGNATURE-----
* looking for address@hidden/libtool--gary--1.0--patch-7 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-7
M libltdl/lt__pre89.h
M ChangeLog
M libltdl/ltdl.c
M libltdl/ltdl.h
M libltdl/argz.c
M libltdl/argz.h
M libltdl/lt__glibc.h
M libltdl/lt_dlloader.h
M libltdl/lt__dirent.c
M libltdl/lt__dirent.h
M libltdl/lt__private.h
M libltdl/lt__alloc.c
M libltdl/lt__alloc.h
M libltdl/lt_system.h
M libltdl/loader-dld_link.c
M libltdl/loader-dlopen.c
M libltdl/loader-dyld.c
M libltdl/loader-loadlibrary.c
M libltdl/loader-shl_load.c
M libltdl/lt_error.h
M libltdl/lt_mutex.h
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
* libltdl/lt__pre89.h, libltdl/ltdl.c, libltdl/ltdl.h, libltdl/argz.c,
libltdl/argz.h, libltdl/lt__glibc.h, libltdl/lt_dlloader.h,
libltdl/lt__dirent.c, libltdl/lt__dirent.h, libltdl/lt__private.h,
libltdl/lt__alloc.c, libltdl/lt__alloc.h, libltdl/lt_system.h,
libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-loadlibrary.c,
libltdl/loader-shl_load.c, libltdl/lt_error.h, libltdl/lt_mutex.h:
Autoconf either defines to 1 or undefs the discovery macros it
puts in config.h, and many (non-GNU) compilers throw a spurious
warning when testing an #undef macro with #if. For consistency,
while we are touching all these lines, use defined(MACRO) style
throughout.
Reported by Bob Friesenhahn <address@hidden>
--- orig/libltdl/argz.c
+++ mod/libltdl/argz.c
@@ -35,12 +35,12 @@
#include <sys/types.h>
#include <errno.h>
-#if HAVE_STRING_H
+#if defined(HAVE_STRING_H)
# include <string.h>
-#elif HAVE_STRINGS_H
+#elif defined(HAVE_STRINGS_H)
# include <strings.h>
#endif
-#if HAVE_MEMORY_H
+#if defined(HAVE_MEMORY_H)
# include <memory.h>
#endif
--- orig/libltdl/argz.h
+++ mod/libltdl/argz.h
@@ -27,14 +27,14 @@
*/
-#ifndef ARGZ_H
+#if !defined(ARGZ_H)
#define ARGZ_H 1
-#if LTDL
+#if defined(LTDL)
# include "lt__glibc.h"
#endif
-#ifdef _cplusplus
+#if defined(_cplusplus)
extern "C" {
#endif
@@ -47,8 +47,8 @@
char * argz_next (char *argz, size_t argz_len, const char *entry);
void argz_stringify (char *argz, size_t argz_len, int sep);
-#ifdef _cplusplus
+#if defined(_cplusplus)
}
#endif
-#endif /*!ARGZ_H*/
+#endif /*!defined(ARGZ_H)*/
--- orig/libltdl/loader-dld_link.c
+++ mod/libltdl/loader-dld_link.c
@@ -30,8 +30,8 @@
#include "lt__private.h"
#include "lt_dlloader.h"
-#if HAVE_DLD_H
-#include <dld.h>
+#if defined(HAVE_DLD_H)
+# include <dld.h>
#endif
static lt_module
--- orig/libltdl/loader-dlopen.c
+++ mod/libltdl/loader-dlopen.c
@@ -30,39 +30,39 @@
#include "lt__private.h"
#include "lt_dlloader.h"
-#if HAVE_DLFCN_H
+#if defined(HAVE_DLFCN_H)
# include <dlfcn.h>
#endif
-#if HAVE_SYS_DL_H
+#if defined(HAVE_SYS_DL_H)
# include <sys/dl.h>
#endif
/* We may have to define LT_LAZY_OR_NOW in the command line if we
find out it does not work in some platform. */
-#ifndef LT_LAZY_OR_NOW
-# ifdef RTLD_LAZY
+#if !defined(LT_LAZY_OR_NOW)
+# if defined(RTLD_LAZY)
# define LT_LAZY_OR_NOW RTLD_LAZY
# else
-# ifdef DL_LAZY
+# if defined(DL_LAZY)
# define LT_LAZY_OR_NOW DL_LAZY
# endif
# endif /* !RTLD_LAZY */
#endif
-#ifndef LT_LAZY_OR_NOW
-# ifdef RTLD_NOW
+#if !defined(LT_LAZY_OR_NOW)
+# ifd efined(RTLD_NOW)
# define LT_LAZY_OR_NOW RTLD_NOW
# else
-# ifdef DL_NOW
+# if defined(DL_NOW)
# define LT_LAZY_OR_NOW DL_NOW
# endif
# endif /* !RTLD_NOW */
#endif
-#ifndef LT_LAZY_OR_NOW
+#if !defined(LT_LAZY_OR_NOW)
# define LT_LAZY_OR_NOW 0
#endif /* !LT_LAZY_OR_NOW */
-#if HAVE_DLERROR
+#if defined(HAVE_DLERROR)
# define DLERROR(arg) dlerror ()
#else
# define DLERROR(arg) LT__STRERROR (arg)
@@ -113,7 +113,7 @@
struct lt_user_dlloader lt__sys_dl =
{
-# ifdef NEED_USCORE
+# if defined(NEED_USCORE)
"_",
# else
0,
--- orig/libltdl/loader-dyld.c
+++ mod/libltdl/loader-dyld.c
@@ -30,7 +30,7 @@
#include "lt__private.h"
#include "lt_dlloader.h"
-#if HAVE_MACH_O_DYLD_H
+#if defined(HAVE_MACH_O_DYLD_H)
# if !defined(__APPLE_CC__) && !defined(__MWERKS__) &&
!defined(__private_extern__)
/* Is this correct? Does it still function properly? */
# define __private_extern__ extern
@@ -41,7 +41,7 @@
#include <mach-o/getsect.h>
/* We have to put some stuff here that isn't in older dyld.h files */
-#ifndef ENUM_DYLD_BOOL
+#if !defined(ENUM_DYLD_BOOL)
# define ENUM_DYLD_BOOL
# undef FALSE
# undef TRUE
@@ -50,10 +50,10 @@
TRUE
};
#endif
-#ifndef LC_REQ_DYLD
+#if !defined(LC_REQ_DYLD)
# define LC_REQ_DYLD 0x80000000
#endif
-#ifndef LC_LOAD_WEAK_DYLIB
+#if !defined(LC_LOAD_WEAK_DYLIB)
# define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
#endif
@@ -71,39 +71,39 @@
static int dyld_cannot_close = 0;
-#ifndef NSADDIMAGE_OPTION_NONE
+#if !defined(NSADDIMAGE_OPTION_NONE)
# define NSADDIMAGE_OPTION_NONE 0x0
#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
+#if !defined(NSADDIMAGE_OPTION_RETURN_ON_ERROR)
# define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
#endif
-#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
+#if !defined(NSADDIMAGE_OPTION_WITH_SEARCHING)
# define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2
#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
+#if !defined(NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED)
# define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
#endif
-#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
+#if !defined(NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME)
# define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
+#if !defined(NSLOOKUPSYMBOLINIMAGE_OPTION_BIND)
# define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+#if !defined(NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW)
# define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
+#if !defined(NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY)
# define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
+#if !defined(NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR)
# define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
#endif
#define LT__SYMLOOKUP_OPTS (NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW \
| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR)
-#ifdef __BIG_ENDIAN__
+#if defined(__BIG_ENDIAN__)
# define LT__MAGIC MH_MAGIC
#else
# define LT__MAGIC MH_CIGAM
@@ -339,7 +339,6 @@
}
else
{
-#if 1
/* Currently, if a module contains c++ static destructors and it
is unloaded, we get a segfault in atexit(), due to compiler and
dynamic loader differences of opinion, this works around that. */
@@ -349,8 +348,7 @@
{
flags |= NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
}
-#endif
-#ifdef __ppc__
+#if defined(__ppc__)
flags |= NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
#endif
if (!NSUnLinkModule (module, flags))
--- orig/libltdl/loader-loadlibrary.c
+++ mod/libltdl/loader-loadlibrary.c
@@ -73,7 +73,7 @@
if (!searchname)
return 0;
-#if __CYGWIN__
+#if defined(__CYGWIN__)
{
char wpath[MAX_PATH];
cygwin_conv_to_full_win32_path(searchname, wpath);
--- orig/libltdl/loader-shl_load.c
+++ mod/libltdl/loader-shl_load.c
@@ -30,7 +30,7 @@
#include "lt__private.h"
#include "lt_dlloader.h"
-#ifdef HAVE_DL_H
+#if defined(HAVE_DL_H)
# include <dl.h>
#endif
@@ -65,10 +65,10 @@
* library specified by the path argument.
*/
-#ifndef DYNAMIC_PATH
+#if !defined(DYNAMIC_PATH)
# define DYNAMIC_PATH 0
#endif
-#ifndef BIND_RESTRICTED
+#if !defined(BIND_RESTRICTED)
# define BIND_RESTRICTED 0
#endif
--- orig/libltdl/lt__alloc.c
+++ mod/libltdl/lt__alloc.c
@@ -27,7 +27,7 @@
*/
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H
#endif
--- orig/libltdl/lt__alloc.h
+++ mod/libltdl/lt__alloc.h
@@ -27,7 +27,7 @@
*/
-#ifndef LT__ALLOC_H
+#if !defined(LT__ALLOC_H)
#define LT__ALLOC_H 1
#include "lt_system.h"
@@ -53,4 +53,4 @@
LT_END_C_DECLS
-#endif /*!LT__ALLOC_H*/
+#endif /*!defined(LT__ALLOC_H)*/
--- orig/libltdl/lt__dirent.c
+++ mod/libltdl/lt__dirent.c
@@ -32,7 +32,7 @@
#include "lt__dirent.h"
-#if __WINDOWS__
+#if defined(__WINDOWS__)
void
closedir (DIR *entry)
@@ -98,4 +98,4 @@
return &entry->file_info;
}
-#endif /*__WINDOWS__*/
+#endif /*defined(__WINDOWS__)*/
--- orig/libltdl/lt__dirent.h
+++ mod/libltdl/lt__dirent.h
@@ -27,10 +27,10 @@
*/
-#ifndef LT__DIRENT_H
+#if !defined(LT__DIRENT_H)
#define LT__DIRENT_H 1
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H
#endif
@@ -46,13 +46,13 @@
`direct' API. */
# define dirent direct
# define D_NAMLEN(dirent) ((dirent)->d_namlen)
-# if HAVE_SYS_NDIR_H
+# if defined(HAVE_SYS_NDIR_H)
# include <sys/ndir.h>
# endif
-# if HAVE_SYS_DIR_H
+# if defined(HAVE_SYS_DIR_H)
# include <sys/dir.h>
# endif
-# if HAVE_NDIR_H
+# if defined(HAVE_NDIR_H)
# include <ndir.h>
# endif
@@ -92,6 +92,6 @@
LT_END_C_DECLS
-#endif /*!__WINDOWS__*/
+#endif /*!defined(__WINDOWS__)*/
-#endif /*!LT__DIRENT_H*/
+#endif /*!defined(LT__DIRENT_H)*/
--- orig/libltdl/lt__glibc.h
+++ mod/libltdl/lt__glibc.h
@@ -27,10 +27,10 @@
*/
-#ifndef LT__GLIBC_H
+#if !defined(LT__GLIBC_H)
#define LT__GLIBC_H 1
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H
#endif
@@ -54,20 +54,20 @@
/* ...finally, we revert to the library implementations of any symbols
that are provided by the host since they may be more optimised (say
with inline assembler) than the generic versions we provide here. */
-#if HAVE_ARGZ_APPEND
+#if defined(HAVE_ARGZ_APPEND)
# undef argz_append
#endif
-#if HAVE_ARGZ_CREATE_SEP
+#if defined(HAVE_ARGZ_CREATE_SEP)
# undef argz_create_sep
#endif
-#if HAVE_ARGZ_INSERT
+#if defined(HAVE_ARGZ_INSERT)
# undef argz_insert
#endif
-#if HAVE_ARGZ_NEXT
+#if defined(HAVE_ARGZ_NEXT)
# undef argz_next
#endif
-#if HAVE_ARGZ_STRINGIFY
+#if defined(HAVE_ARGZ_STRINGIFY)
# undef argz_stringify
#endif
-#endif /*!LT__GLIBC_H*/
+#endif /*!defined(LT__GLIBC_H)*/
--- orig/libltdl/lt__pre89.h
+++ mod/libltdl/lt__pre89.h
@@ -27,10 +27,10 @@
*/
-#ifndef LT__PREC89_H
+#if !defined(LT__PREC89_H)
#define LT__PREC89_H 1
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H
#endif
@@ -38,14 +38,14 @@
LT_BEGIN_C_DECLS
-#if ! HAVE_STRCMP
+#if !defined(HAVE_STRCMP)
# undef strcmp
# define strcmp lt__strcmp
int strcmp (const char *str1, const char *str2);
#endif
-#if ! HAVE_STRCHR
-# if HAVE_INDEX
+#if !defined(HAVE_STRCHR)
+# if defined(HAVE_INDEX)
# define strchr index
# else
# undef strchr
@@ -54,8 +54,8 @@
# endif
#endif
-#if ! HAVE_STRRCHR
-# if HAVE_RINDEX
+#if !defined(HAVE_STRRCHR)
+# if defined(HAVE_RINDEX)
# define strrchr rindex
# else
# undef strcmp
@@ -64,8 +64,8 @@
# endif
#endif
-#if ! HAVE_MEMCPY
-# if HAVE_BCOPY
+#if !defined(HAVE_MEMCPY)
+# if defined(HAVE_BCOPY)
# define memcpy(dest, src, size) bcopy((src), (dest), (size))
# else
# undef memcpy
@@ -74,7 +74,7 @@
# endif
#endif
-#if ! HAVE_MEMMOVE
+#if !defined(HAVE_MEMMOVE)
# undef memmove
# define memmove lt__memmove
void *memmove (void *dest, const void *src, size_t size);
@@ -82,4 +82,4 @@
LT_END_C_DECLS
-#endif /*!LT__PREC89*/
+#endif /*!defined(LT__PREC89)*/
--- orig/libltdl/lt__private.h
+++ mod/libltdl/lt__private.h
@@ -27,10 +27,10 @@
*/
-#ifndef LT__PRIVATE_H
+#if !defined(LT__PRIVATE_H)
#define LT__PRIVATE_H 1
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H
#endif
@@ -39,18 +39,18 @@
#include <assert.h>
#include <errno.h>
-#if HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H)
# include <unistd.h>
#endif
-#if HAVE_STRING_H
+#if defined(HAVE_STRING_H)
# include <string.h>
#else
-# if HAVE_STRINGS_H
+# if defined(HAVE_STRINGS_H)
# include <strings.h>
# endif
#endif
-#if HAVE_MEMORY_H
+#if defined(HAVE_MEMORY_H)
# include <memory.h>
#endif
@@ -63,11 +63,11 @@
/* ...and all exported interfaces. */
#include "ltdl.h"
-#if WITH_DMALLOC
+#if defined(WITH_DMALLOC)
# include <dmalloc.h>
#endif
-#ifdef DLL_EXPORT
+#if defined(DLL_EXPORT)
# define LT_GLOBAL_DATA __declspec(dllexport)
#else
# define LT_GLOBAL_DATA
@@ -76,7 +76,7 @@
LT_BEGIN_C_DECLS
-#ifndef errno
+#if !defined(errno)
extern int errno;
#endif
@@ -135,4 +135,4 @@
LT_END_C_DECLS
-#endif /*!LT__PRIVATE_H*/
+#endif /*!defined(LT__PRIVATE_H)*/
--- orig/libltdl/lt_dlloader.h
+++ mod/libltdl/lt_dlloader.h
@@ -27,7 +27,7 @@
*/
-#ifndef LT_DLLOADER_H
+#if !defined(LT_DLLOADER_H)
#define LT_DLLOADER_H 1
#include <libltdl/lt_system.h>
@@ -68,4 +68,4 @@
LT_END_C_DECLS
-#endif /*!LT_DLLOADER_H*/
+#endif /*!defined(LT_DLLOADER_H)*/
--- orig/libltdl/lt_error.h
+++ mod/libltdl/lt_error.h
@@ -27,7 +27,7 @@
*/
/* Only include this header file once. */
-#ifndef LT_ERROR_H
+#if !defined(LT_ERROR_H)
#define LT_ERROR_H 1
#include <libltdl/lt_system.h>
@@ -75,4 +75,4 @@
LT_END_C_DECLS
-#endif /*!LT_ERROR_H*/
+#endif /*!defined(LT_ERROR_H)*/
--- orig/libltdl/lt_mutex.h
+++ mod/libltdl/lt_mutex.h
@@ -27,7 +27,7 @@
*/
/* Only include this header file once. */
-#ifndef LT_MUTEX_H
+#if !defined(LT_MUTEX_H)
#define LT_MUTEX_H 1
#include <libltdl/lt_system.h>
@@ -46,4 +46,4 @@
LT_END_C_DECLS
-#endif /*!LT_MUTEX_H*/
+#endif /*!defined(LT_MUTEX_H)*/
--- orig/libltdl/lt_system.h
+++ mod/libltdl/lt_system.h
@@ -26,7 +26,7 @@
02111-1307 USA
*/
-#ifndef LT_SYSTEM_H
+#if !defined(LT_SYSTEM_H)
#define LT_SYSTEM_H 1
#include <stddef.h>
@@ -34,10 +34,10 @@
#include <sys/types.h>
/* Some systems do not define EXIT_*, even with STDC_HEADERS. */
-#ifndef EXIT_SUCCESS
+#if !defined(EXIT_SUCCESS)
# define EXIT_SUCCESS 0
#endif
-#ifndef EXIT_FAILURE
+#if !defined(EXIT_FAILURE)
# define EXIT_FAILURE 1
#endif
@@ -51,7 +51,7 @@
/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
so that C++ compilers don't mangle their names. Use LTDL_END_C_DECLS at
the end of C declarations. */
-#ifdef __cplusplus
+#if defined(__cplusplus)
# define LT_BEGIN_C_DECLS extern "C" {
# define LT_END_C_DECLS }
#else
@@ -96,37 +96,21 @@
/* DLL building support on win32 hosts; mostly to workaround their
ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-# ifdef __WINDOWS__
-# ifdef DLL_EXPORT /* defined by libtool (if required) */
+#if !defined(LT_SCOPE)
+# if defined(__WINDOWS__)
+# if defined(DLL_EXPORT) /* defined by libtool (if required) */
# define LT_SCOPE __declspec(dllexport)
# endif
-# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */
+# if defined(LIBLTDL_DLL_IMPORT) /* define if linking with this dll */
# define LT_SCOPE extern __declspec(dllimport)
# endif
# endif
-# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */
+# if !defined(LT_SCOPE) /* static linking or !__WINDOWS__ */
# define LT_SCOPE extern
# endif
#endif
-/* DLL building support on win32 hosts; mostly to workaround their
- ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-# ifdef __WINDOWS__
-# ifdef DLL_EXPORT /* defined by libtool (if required) */
-# define LT_SCOPE __declspec(dllexport)
-# endif
-# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */
-# define LT_SCOPE extern __declspec(dllimport)
-# endif
-# endif
-# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */
-# define LT_SCOPE extern
-# endif
-#endif
-
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__)
/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
separator when it is set. */
# define LT_DIRSEP_CHAR '\\'
@@ -155,4 +139,4 @@
# define LT_CONC(s,t) s/**/t
#endif
-#endif /*!LT__SYSTEM_H */
+#endif /*!defined(LT__SYSTEM_H)*/
--- orig/libltdl/ltdl.c
+++ mod/libltdl/ltdl.c
@@ -43,7 +43,7 @@
#define LTDL_ARCHIVE_EXT ".la"
/* max. filename length */
-#ifndef LT_FILENAME_MAX
+#if !defined(LT_FILENAME_MAX)
# define LT_FILENAME_MAX 1024
#endif
@@ -110,10 +110,10 @@
static const char objdir[] = LTDL_OBJDIR;
static const char archive_ext[] = LTDL_ARCHIVE_EXT;
-#ifdef LTDL_SHLIB_EXT
+#if defined(LTDL_SHLIB_EXT)
static const char shlib_ext[] = LTDL_SHLIB_EXT;
#endif
-#ifdef LTDL_SYSSEARCHPATH
+#if defined(LTDL_SYSSEARCHPATH)
static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
#endif
@@ -121,22 +121,22 @@
/* --- DLLOADER VIRTUAL FUNCTION TABLES --- */
-#if HAVE_LIBDL
+#if defined(HAVE_LIBDL)
LT_SCOPE struct lt_user_dlloader lt__sys_dl;
#endif
-#if HAVE_SHL_LOAD
+#if defined(HAVE_SHL_LOAD)
LT_SCOPE struct lt_user_dlloader lt__sys_shl;
#endif
#if defined(__WINDOWS__) || defined(__CYGWIN__)
LT_SCOPE struct lt_user_dlloader lt__sys_wll;
#endif
-#ifdef __BEOS__
+#if defined(__BEOS__)
LT_SCOPE struct lt_user_dlloader lt__sys_bedl;
#endif
-#if HAVE_DLD
+#if defined(HAVE_DLD)
LT_SCOPE struct lt_user_dlloader lt__sys_dld;
#endif
-#if HAVE_DYLD
+#if defined(HAVE_DYLD)
LT_SCOPE struct lt_user_dlloader lt__sys_dyld;
LT_SCOPE int lt__sys_dyld_init (void);
#endif
@@ -232,20 +232,20 @@
/* All ltdl supplied loaders are in the /dl[a-z-]+/ namespace. */
errors += lt_dlloader_add (LOADER_APPEND, <__presym, "dlpreload");
-#if HAVE_DLD
+#if defined(HAVE_DLD)
errors += lt_dlloader_add (LOADER_APPEND, <__sys_dld, "dld");
#endif
-#if HAVE_DYLD
+#if defined(HAVE_DYLD)
errors += lt_dlloader_add (LOADER_APPEND, <__sys_dyld, "dldyld");
errors += lt__sys_dyld_init();
#endif
-#ifdef __BEOS__
+#if defined(__BEOS__)
errors += lt_dlloader_add (LOADER_APPEND, <__sys_bedl, "dlopen");
#endif
-#if HAVE_SHL_LOAD
+#if defined(HAVE_SHL_LOAD)
errors += lt_dlloader_add (LOADER_APPEND, <__sys_shl, "dlopen");
#endif
-#if HAVE_LIBDL
+#if defined(HAVE_LIBDL)
errors += lt_dlloader_add (LOADER_APPEND, <__sys_dl, "dlopen");
#endif
#if defined(__WINDOWS__) || defined(__CYGWIN__)
@@ -448,7 +448,7 @@
assert (handle);
assert (dirname);
assert (dlname);
-#ifdef LT_DIRSEP_CHAR
+#if defined(LT_DIRSEP_CHAR)
/* Only canonicalized names (i.e. with DIRSEP chars already converted)
should make it into this function: */
assert (strchr (dirname, LT_DIRSEP_CHAR) == 0);
@@ -556,7 +556,7 @@
/* Anything other than a directory separator is copied verbatim. */
if ((path[src] != '/')
-#ifdef LT_DIRSEP_CHAR
+#if defined(LT_DIRSEP_CHAR)
&& (path[src] != LT_DIRSEP_CHAR)
#endif
)
@@ -568,7 +568,7 @@
NULL terminator. */
else if ((path[1+ src] != LT_PATHSEP_CHAR)
&& (path[1+ src] != LT_EOS_CHAR)
-#ifdef LT_DIRSEP_CHAR
+#if defined(LT_DIRSEP_CHAR)
&& (path[1+ src] != LT_DIRSEP_CHAR)
#endif
&& (path[1+ src] != '/'))
@@ -762,7 +762,7 @@
static int
load_deplibs (lt_dlhandle handle, char *deplibs)
{
-#if LTDL_DLOPEN_DEPLIBS
+#if defined(LTDL_DLOPEN_DEPLIBS)
char *p, *save_search_path = 0;
int depcount = 0;
int i;
@@ -772,7 +772,7 @@
handle->depcount = 0;
-#if LTDL_DLOPEN_DEPLIBS
+#if defined(LTDL_DLOPEN_DEPLIBS)
if (!deplibs)
{
return errors;
@@ -1104,7 +1104,7 @@
file = find_file (search_path, base_name, &dir);
}
-#ifdef LTDL_SHLIBPATH_VAR
+#if defined(LTDL_SHLIBPATH_VAR)
if (!file)
{
search_path = getenv (LTDL_SHLIBPATH_VAR);
@@ -1112,7 +1112,7 @@
file = find_file (search_path, base_name, &dir);
}
#endif
-#ifdef LTDL_SYSSEARCHPATH
+#if defined(LTDL_SYSSEARCHPATH)
if (!file && sys_search_path)
{
file = find_file (sys_search_path, base_name, &dir);
@@ -1307,11 +1307,11 @@
if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
&& !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
&newhandle)
-#ifdef LTDL_SHLIBPATH_VAR
+#if defined(LTDL_SHLIBPATH_VAR)
&& !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
&newhandle)
#endif
-#ifdef LTDL_SYSSEARCHPATH
+#if defined(LTDL_SYSSEARCHPATH)
&& !find_handle (sys_search_path, base_name, &newhandle)
#endif
)))
@@ -1407,7 +1407,7 @@
/* If FILENAME already bears a suitable extension, there is no need
to try appending additional extensions. */
if (ext && ((strcmp (ext, archive_ext) == 0)
-#ifdef LTDL_SHLIB_EXT
+#if defined(LTDL_SHLIB_EXT)
|| (strcmp (ext, shlib_ext) == 0)
#endif
))
@@ -1435,7 +1435,7 @@
return handle;
}
-#ifdef LTDL_SHLIB_EXT
+#if defined(LTDL_SHLIB_EXT)
/* Try appending SHLIB_EXT. */
if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext))
{
@@ -1673,14 +1673,14 @@
foreachfile_callback, func, data);
}
-#ifdef LTDL_SHLIBPATH_VAR
+#if defined(LTDL_SHLIBPATH_VAR)
if (!is_done)
{
is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0,
foreachfile_callback, func, data);
}
#endif
-#ifdef LTDL_SYSSEARCHPATH
+#if defined(LTDL_SYSSEARCHPATH)
if (!is_done)
{
is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0,
--- orig/libltdl/ltdl.h
+++ mod/libltdl/ltdl.h
@@ -27,7 +27,7 @@
*/
/* Only include this header file once. */
-#ifndef LTDL_H
+#if !defined(LTDL_H)
#define LTDL_H 1
#include <libltdl/lt_system.h>
@@ -139,7 +139,7 @@
/* --- SOURCE COMPATIBILITY WITH ANCIENT LIBLTDL --- */
-#ifdef LT_NON_POSIX_NAMESPACE
+#if defined(LT_NON_POSIX_NAMESPACE)
# define lt_ptr_t void *
# define lt_module_t lt_module
# define lt_module_open_t lt_module_open
@@ -152,4 +152,4 @@
LT_END_C_DECLS
-#endif /* !LTDL_H */
+#endif /*!defined(LTDL_H)*/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: libtool--gary--1.0--patch-8,
Gary V. Vaughan <=