*** empty log message ***

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@306 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/cproto.sh b/src/cproto.sh
index 7468715..169ebef 100644 (file)
--- a/src/cproto.sh
+++ b/src/cproto.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-(
+
+exec > prototypes.h
+
 cat <<END
 /* This file was generated by cproto. */
 #if PROTOTYPES /* defined in config.h */
@@ -11,7 +13,7 @@ cat <<END
 END
 
 cproto -m -d \
-       -D HAVE_STRDUP=0 -D HAVE_MEMSET=0 \
+       -D STDC_HEADERS=1 -D HAVE_STRDUP=0 -D HAVE_MEMSET=0 -D HAVE_MEMMOVE=0 \
        append.c crcio.c dhuf.c extract.c header.c \
        huf.c larc.c lhadd.c lharc.c lhext.c \
        lhlist.c maketbl.c maketree.c patmatch.c \
@@ -22,6 +24,9 @@ cat <<END
 /* lharc.c */
 RETSIGTYPE interrupt(int signo);
 /* util.c */
+#if !HAVE_MEMMOVE
+void *memmove P_(void *dst, const void *src, size_t cnt)
+#endif
 #if !HAVE_STRDUP
 char *strdup P_((char *buf));
 #endif
@@ -37,4 +42,3 @@ int snprintf P_((char *str, size_t n, char const *fmt, ...));
 
 #undef P_
 END
-) > prototypes.h

diff --git a/src/lharc.c b/src/lharc.c
index b7bd6f6..dcea44e 100644 (file)
--- a/src/lharc.c
+++ b/src/lharc.c
@@ -466,7 +466,7 @@ print_version()
 }
 
 void
-#if PROTOTYPES
+#if STDC_HEADERS
 message(char *fmt, ...)
 #else
 message(fmt, va_alist)
@@ -490,7 +490,7 @@ message(fmt, va_alist)
 
 /* ------------------------------------------------------------------------ */
 void
-#if PROTOTYPES
+#if STDC_HEADERS
 warning(char *fmt, ...)
 #else
 warning(fmt, va_alist)
@@ -514,7 +514,7 @@ warning(fmt, va_alist)
 
 /* ------------------------------------------------------------------------ */
 void
-#if PROTOTYPES
+#if STDC_HEADERS
 error(char *fmt, ...)
 #else
 error(fmt, va_alist)
@@ -537,7 +537,7 @@ error(fmt, va_alist)
 }
 
 void
-#if PROTOTYPES
+#if STDC_HEADERS
 fatal_error(char *fmt, ...)
 #else
 fatal_error(fmt, va_alist)

diff --git a/src/prototypes.h b/src/prototypes.h
index 432cf31..703a2b3 100644 (file)
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -1,4 +1,4 @@
-/* This file was generated by cproto */
+/* This file was generated by cproto. */
 #if PROTOTYPES /* defined in config.h */
 #define P_(s) s
 #else
@@ -127,6 +127,9 @@ char *xmemrchr P_((const char *s, int c, size_t n));
 /* lharc.c */
 RETSIGTYPE interrupt(int signo);
 /* util.c */
+#if !HAVE_MEMMOVE
+void *memmove P_(void *dst, const void *src, size_t cnt)
+#endif
 #if !HAVE_STRDUP
 char *strdup P_((char *buf));
 #endif