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

[mdsms.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index b51d61b..b7e0cf5 100644 (file)
--- 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
@@ -54,6 +42,10 @@
 #undef HAVE_CBAUDEX
 #undef CBAUDEX
 
+/* CRTSCTS define, may be missing. */
+#undef HAVE_CRTSCTS
+#undef CRTSCTS
+
 /* FD_SETSIZE define, may be missing. */
 #undef HAVE_FD_SETSIZE
 
@@ -201,6 +193,7 @@ extern char *sys_errlist[];
 #define offsetof(a,b) ((size_t)&((a *)0)->b)
 #endif
 
+#ifndef DONT_NEED_DECLARATIONS
 /*
  * Handles all of the internationalization configuration options.
  * Author: Tom Tromey <tromey@creche.cygnus.com>
@@ -211,9 +204,10 @@ extern char *sys_errlist[];
 #ifdef HAVE_LIBINTL_H
 #    include <libintl.h>
 #endif /* HAVE_LIBINTL_H */
-#    define _(String) gettext (String)
+/* 'gettext()' may not be declared here and it will default to return 'int'! */
+#    define _(String) ((const char *)gettext (String))
 #    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
+#        define N_(String) ((const char *)gettext_noop (String))
 #    else
 #        define N_(String) (String)
 #    endif
@@ -227,3 +221,4 @@ extern char *sys_errlist[];
 #    define _(String) (String)
 #    define N_(String) (String)
 #endif /* ENABLE_NLS */
+#endif /* !DONT_NEED_DECLARATIONS */