X-Git-Url: http://git.jankratochvil.net/?p=mdsms.git;a=blobdiff_plain;f=acconfig.h;h=a366e4895f318a819cf8e6484e2dde7026287402;hp=ac1bcefcde512ee07c5569664d803f1326c2ad41;hb=30abdc172e133a85bd88a9831450d0fffac1f258;hpb=60a8ee1e4b1a417463840bbfa07f3a07cfb06014

diff --git a/acconfig.h b/acconfig.h
index ac1bcef..a366e48 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,18 +30,6 @@
 /* Disable runtime assertion checks. */
 #undef NDEBUG
 
-/* Provide stub for MAX-function if needed. */
-#undef HAVE_MAX
-#ifndef HAVE_MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
-/* Provide stub for MIN-function if needed. */
-#undef HAVE_MIN
-#ifndef HAVE_MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
 /* LINE_MAX from <limits.h>, provide default if not defined. */
 #undef HAVE_LINE_MAX
 #undef LINE_MAX
@@ -86,81 +74,114 @@
 
 @BOTTOM@
 
-#ifndef DONT_NEED_DECLARATIONS
+#ifdef WANT_DECLARATIONS
 
 /* 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
 
-#endif /* !DONT_NEED_DECLARATIONS */
+/* 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 /* WANT_DECLARATIONS */
 
 /* snprintf(3) unsafe emulation */
 #ifdef HAVE_SNPRINTF
@@ -205,7 +226,7 @@ extern char *sys_errlist[];
 #define offsetof(a,b) ((size_t)&((a *)0)->b)
 #endif
 
-#ifndef DONT_NEED_DECLARATIONS
+#ifdef WANT_DECLARATIONS
 /*
  * Handles all of the internationalization configuration options.
  * Author: Tom Tromey <tromey@creche.cygnus.com>
@@ -216,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
@@ -233,4 +253,4 @@ extern char *sys_errlist[];
 #    define _(String) (String)
 #    define N_(String) (String)
 #endif /* ENABLE_NLS */
-#endif /* !DONT_NEED_DECLARATIONS */
+#endif /* WANT_DECLARATIONS */