Message-ID: <20011020171738.3713.qmail@softhome.net>
From: lauras AT softhome DOT net
To: st001906 AT HRZ1 DOT HRZ DOT TU-Darmstadt DOT De
Cc: djgpp-workers AT delorie DOT com
Subject: Small djgpp-specific fix to gettext
Date: Sat, 20 Oct 2001 17:17:38 GMT
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Sender: lauras AT softhome DOT net
Reply-To: djgpp-workers AT delorie DOT com



Hello,

Build process of gettext-0.10.40 fails in testsuite because it redefines
gettext macros to something else. However, libgnuintl.h unconditionally
defines them on DJGPP, while IMHO this is required iff conio.h has been
previously defined. The tiny patch below allows building all programs in
the testsuite.

Laurynas

--- libgnuintl.h.old	Mon Sep  3 14:00:50 2001
+++ libgnuintl.h	Sat Oct 20 18:46:32 2001
@@ -37,7 +37,7 @@
 
 /* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
    precedence over _conio_gettext.  */
-#ifdef __DJGPP__
+#if defined __DJGPP__ && defined __dj_include_conio_h_
 # undef gettext
 # define gettext gettext
 #endif