From: Gary V. Vaughan Date: Tue, 24 Apr 2001 22:53:48 +0000 (+0000) Subject: * ltdl.m4 (AC_C_INLINE): No longer required. X-Git-Tag: release-1-4~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb267cab4e69c42fd3dc7dd7b41cabaf6bb4a9e0;p=thirdparty%2Flibtool.git * ltdl.m4 (AC_C_INLINE): No longer required. * libltdl/ltdl.c (strdup, strcmp, strchr, strrchr, memcpy, trim, free_vars): Revoke inline keyword from declarations. `static inline' is not very portable, and in addition Unixware 7.1.1's compiler says you can't access static variables from inline functions. Reported by Peter Eisentraut --- diff --git a/ChangeLog b/ChangeLog index e32081c25..bbf2a6b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-04-24 Gary V. Vaughan + + * ltdl.m4 (AC_C_INLINE): No longer required. + * libltdl/ltdl.c (strdup, strcmp, strchr, strrchr, memcpy, trim, + free_vars): Revoke inline keyword from declarations. `static + inline' is not very portable, and in addition Unixware 7.1.1's + compiler says you can't access static variables from inline + functions. + Reported by Peter Eisentraut + 2001-04-24 Albert Chin-A-Young * libtool.m4: Handle case where /bin/nm -p outputs multiple diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 8e8f00961..872a5701d 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -342,7 +342,7 @@ lt_dlseterror (index) #undef strdup #define strdup rpl_strdup -static inline char * +static char * strdup(str) const char *str; { @@ -366,7 +366,7 @@ strdup(str) #undef strcmp #define strcmp rpl_strcmp -static inline int +static int strcmp (str1, str2) const char *str1; const char *str2; @@ -396,7 +396,7 @@ strcmp (str1, str2) # else # define strchr rpl_strchr -static inline const char* +static const char* strchr(str, ch) const char *str; int ch; @@ -419,7 +419,7 @@ strchr(str, ch) # else # define strrchr rpl_strrchr -static inline const char* +static const char* strrchr(str, ch) const char *str; int ch; @@ -450,7 +450,7 @@ strrchr(str, ch) # else # define memcpy rpl_memcpy -static inline char * +static char * memcpy (dest, src, size) char *dest; const char *src; @@ -1953,7 +1953,7 @@ unload_deplibs(handle) return errors; } -static inline int +static int trim (dest, str) char **dest; const char *str; @@ -1987,7 +1987,7 @@ trim (dest, str) return 0; } -static inline int +static int free_vars( dlname, oldname, libdir, deplibs) char *dlname; char *oldname; diff --git a/ltdl.m4 b/ltdl.m4 index 03f615081..d3ee60269 100644 --- a/ltdl.m4 +++ b/ltdl.m4 @@ -28,7 +28,6 @@ AC_DEFUN(AC_LIB_LTDL, [AC_PREREQ(2.13)dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_C_CONST])dnl -AC_REQUIRE([AC_C_INLINE])dnl # Perform all the checks necessary for compilation of the ltdl objects # -- including compiler checks (above) and header checks (below).