'gettext' declaration checked, no retyping ('int->void *' may not be possible)

[mdsms.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index b7e0cf5..912a31e 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -79,75 +79,108 @@
 /* Declaration for gethostname(3)? */
 #undef NEED_DECLARATION_GETHOSTNAME
 #ifdef NEED_DECLARATION_GETHOSTNAME
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 int gethostname(char *name, size_t len);
 #endif
 
 /* Declaration for kill(2)? */
 #undef NEED_DECLARATION_KILL
 #ifdef NEED_DECLARATION_KILL
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 int kill(pid_t pid, int sig);
 #endif
 
 /* Declaration for snprintf(3)? */
 #undef NEED_DECLARATION_SNPRINTF
 #ifdef NEED_DECLARATION_SNPRINTF
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 int snprintf(char *str, size_t n, const char *format, ...);
 #endif
 
 /* Declaration for vsnprintf(3)? */
 #undef NEED_DECLARATION_VSNPRINTF
 #ifdef NEED_DECLARATION_VSNPRINTF
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
 int vsnprintf(char *str, size_t n, const char *format, va_list ap);
 #endif
 
 /* Declaration for strdup(3)? */
 #undef NEED_DECLARATION_STRDUP
 #ifdef NEED_DECLARATION_STRDUP
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 char *strdup(const char *s);
 #endif
 
 /* Declaration for usleep(3)? */
 #undef NEED_DECLARATION_USLEEP
 #ifdef NEED_DECLARATION_USLEEP
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 void usleep(unsigned long usec);
 #endif
 
 /* Declaration for strcasecmp(3)? */
 #undef NEED_DECLARATION_STRCASECMP
 #ifdef NEED_DECLARATION_STRCASECMP
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 int strcasecmp(const char *s1, const char *s2);
 #endif
 
 /* Declaration for siginterrupt(3)? */
 #undef NEED_DECLARATION_SIGINTERRUPT
 #ifdef NEED_DECLARATION_SIGINTERRUPT
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 int siginterrupt(int sig, int flag);
 #endif
 
 /* Declaration for popen(3)? */
 #undef NEED_DECLARATION_POPEN
 #ifdef NEED_DECLARATION_POPEN
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 FILE *popen(const char *command, const char *type);
 #endif
 
 /* Declaration for pclose(3)? */
 #undef NEED_DECLARATION_PCLOSE
 #ifdef NEED_DECLARATION_PCLOSE
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 int pclose(FILE *stream);
 #endif
 
+/* Declaration for gettext(3)? */
+#undef NEED_DECLARATION_GETTEXT
+#ifdef NEED_DECLARATION_GETTEXT
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
+extern const char *gettext(const char *msgid);
+#endif
+
 #endif /* !DONT_NEED_DECLARATIONS */
 
 /* snprintf(3) unsafe emulation */
@@ -204,10 +237,9 @@ extern char *sys_errlist[];
 #ifdef HAVE_LIBINTL_H
 #    include <libintl.h>
 #endif /* HAVE_LIBINTL_H */
-/* 'gettext()' may not be declared here and it will default to return 'int'! */
-#    define _(String) ((const char *)gettext (String))
+#    define _(String) gettext (String)
 #    ifdef gettext_noop
-#        define N_(String) ((const char *)gettext_noop (String))
+#        define N_(String) gettext_noop (String)
 #    else
 #        define N_(String) (String)
 #    endif