equal
deleted
inserted
replaced
|
1 # Copied over from the desktop consolidation, which has the comment: |
|
2 # date:2010-01-27 owner:yippi type:bug state:upstream |
|
3 |
|
4 --- lynx2-8-7/src/LYMain.c-orig 2010-12-30 16:59:09.933129015 -0600 |
|
5 +++ lynx2-8-7/src/LYMain.c 2010-12-30 16:59:56.506438066 -0600 |
|
6 @@ -57,7 +57,7 @@ |
|
7 #include <io.h> |
|
8 #endif |
|
9 |
|
10 -#if defined(LOCALE) && !defined(HAVE_LIBINTL_H) |
|
11 +#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL)) |
|
12 #undef gettext /* Solaris locale.h prototypes gettext() */ |
|
13 #include <locale.h> |
|
14 #ifndef HAVE_GETTEXT |