X-Git-Url: http://git.jankratochvil.net/?p=mdsms.git;a=blobdiff_plain;f=acconfig.h;h=b7e0cf59af0681627fd5cf71fcd5fbf03be54e94;hp=8134a13dee0c162c49df07210413ea2df6b247ee;hb=5a2446d9cb2d2af3be2de8aa5cf791dd503d69fe;hpb=2f305f287d1c2d392718c8e9e70c1b0213e306e1

diff --git a/acconfig.h b/acconfig.h
index 8134a13..b7e0cf5 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
@@ -216,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