author | Rich Burridge <rich.burridge@oracle.com> |
Wed, 18 Feb 2015 12:08:43 -0800 | |
branch | s11-update |
changeset 3830 | d9fd82448491 |
permissions | -rw-r--r-- |
3830
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# Copied over from the desktop consolidation, which has the comment: |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# date:2010-01-27 owner:yippi type:bug state:upstream |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
--- lynx2-8-7/src/LYMain.c-orig 2010-12-30 16:59:09.933129015 -0600 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
+++ lynx2-8-7/src/LYMain.c 2010-12-30 16:59:56.506438066 -0600 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
@@ -57,7 +57,7 @@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
#include <io.h> |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
#endif |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
-#if defined(LOCALE) && !defined(HAVE_LIBINTL_H) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
+#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL)) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
#undef gettext /* Solaris locale.h prototypes gettext() */ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
#include <locale.h> |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
#ifndef HAVE_GETTEXT |