* config/ltmain.m4sh (cwrappersource): clean up warnings and

#include errors.

diff --git a/ChangeLog b/ChangeLog
index 9584de43374ad67255dc3b06b06ad52c31cfbcd0..b276cf583f38032db85e71317754f60ded88102a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-01  Peter Ekberg  <spam.protected>
+
+       * config/ltmain.m4sh (cwrappersource): clean up warnings and
+       #include errors.
+
 2004-11-01  Peter Ekberg  <spam.protected>
 
        Sometimes, a wrapper script is generated for an executable that,

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index afa3277ea28120f222383f2ab39020ef2601a466..f4860ce7b608abea0c29fa46c62f9dbb80a30b4b 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -5661,6 +5661,7 @@ EOF
 #include <malloc.h>
 #include <stdarg.h>
 #include <assert.h>
+#include <string.h>
 #include <sys/stat.h>
 
 #if defined(PATH_MAX)
@@ -5705,6 +5706,8 @@ EOF
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
 #if defined DEBUGWRAPPER
 # define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
 #else
@@ -5762,6 +5765,7 @@ EOF
 EOF
 
            cat >> $cwrappersource <<"EOF"
+  return 0;
 }
 
 void *
@@ -5831,7 +5835,6 @@ find_executable (const char* wrapper)
   int has_slash = 0;
   const char* p;
   const char* p_next;
-  struct stat st;
   /* static buffer for getcwd */
   char tmp[[LT_PATHMAX + 1]];
   int tmp_len;