summaryrefslogtreecommitdiff
path: root/mcon/U/d_locconv.U
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@golden-gryphon.com>2014-04-27 18:05:39 -0700
committerManoj Srivastava <srivasta@golden-gryphon.com>2014-04-27 18:05:39 -0700
commit7d4c02d5c9108aa413fbb0ffa1dc8a39bc5f54a1 (patch)
tree2abb9ad01d397bc1e208f57f528c1ec529761392 /mcon/U/d_locconv.U
parent5c913c35c09a82eead2c07534baa709a5dead3e7 (diff)
parent8f5e5726134ce5b4bd436b16f367796d851df553 (diff)
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com> Conflicts: jmake/jmake.man
Diffstat (limited to 'mcon/U/d_locconv.U')
-rw-r--r--mcon/U/d_locconv.U25
1 files changed, 19 insertions, 6 deletions
diff --git a/mcon/U/d_locconv.U b/mcon/U/d_locconv.U
index 98a2bbc..6b357f6 100644
--- a/mcon/U/d_locconv.U
+++ b/mcon/U/d_locconv.U
@@ -1,11 +1,11 @@
-?RCS: $Id: d_locconv.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: d_locconv.U 167 2013-05-08 17:58:00Z rmanfredi $
?RCS:
?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
?RCS:
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
?RCS: as specified in the README file that comes with the distribution.
?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
?RCS: of the source tree for dist 4.0.
?RCS:
?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu>
@@ -14,7 +14,7 @@
?RCS: Revision 3.0.1.1 1994/10/29 16:14:11 ram
?RCS: patch36: created by ADO
?RCS:
-?MAKE:d_locconv: Inlibc
+?MAKE:d_locconv: Trylink cat i_locale
?MAKE: -pick add $@ %<
?S:d_locconv:
?S: This variable conditionally defines HAS_LOCALECONV if localeconv() is
@@ -28,6 +28,19 @@
?H:.
?LINT:set d_locconv
: see if localeconv exists
-set localeconv d_locconv
-eval $inlibc
+$cat >try.c <<EOC
+#$i_locale I_LOCALE
+#ifdef I_LOCALE
+#include <locale.h>
+#endif
+int main(void)
+{
+ struct lconv *lc;
+ lc = localeconv();
+ return lc ? 0 : 1;
+}
+EOC
+cyn=localeconv
+set d_locconv
+eval $trylink