old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mon Apr 18 16:00:22 2005 Michael Jennings (mej) 

Remove unused NO_XLOCALE crap and do it right.
----------------------------------------------------------------------


SVN revision: 14227
This commit is contained in:
Michael Jennings 2005-04-18 20:01:59 +00:00
parent d983ccb3c5
commit 4d779be4e2
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5313,3 +5313,7 @@ Fixed error in saving of cut_chars attribute.
Fixed saving/handling of beep_command attribute. Fixed saving/handling of beep_command attribute.
---------------------------------------------------------------------- ----------------------------------------------------------------------
Mon Apr 18 16:00:22 2005 Michael Jennings (mej)
Remove unused NO_XLOCALE crap and do it right.
----------------------------------------------------------------------

5
configure.in
View File

@ -205,7 +205,7 @@ sys/ioctl.h sys/select.h sys/time.h \
sys/sockio.h sys/byteorder.h malloc.h \ sys/sockio.h sys/byteorder.h malloc.h \
utmpx.h unistd.h bsd/signal.h regex.h \ utmpx.h unistd.h bsd/signal.h regex.h \
regexp.h stdarg.h X11/Xmu/Atoms.h \ regexp.h stdarg.h X11/Xmu/Atoms.h \
X11/Sunkeysym.h) X11/Sunkeysym.h X11/Xlocale.h)
AC_HEADER_TIME AC_HEADER_TIME
dnl# Missing typedefs and replacements dnl# Missing typedefs and replacements
@ -817,9 +817,6 @@ AC_ARG_ENABLE(xim,
XIM="TRUE" XIM="TRUE"
]) ])
# check if we need X_LOCALE definition
AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE, , [X locale.]), AC_DEFINE(NO_XLOCALE, , [No X locale.]))
# For multibyte selection handling # For multibyte selection handling
#if test "$MULTICHAR_ENCODING" != "none"; then #if test "$MULTICHAR_ENCODING" != "none"; then
AC_CHECK_LIB(Xmu, XmuInternAtom) AC_CHECK_LIB(Xmu, XmuInternAtom)

5
src/command.h
View File

@ -26,11 +26,10 @@
# include <X11/Xproto.h> # include <X11/Xproto.h>
# include <X11/keysym.h> # include <X11/keysym.h>
# if defined(NO_XLOCALE) || !defined(HAVE_X11_LOCALE_H) # ifdef HAVE_X11_LOCALE_H
# include <locale.h>
# else
# include <X11/Xlocale.h> # include <X11/Xlocale.h>
# endif # endif
# include <locale.h>
# include "options.h" # include "options.h"
# include "system.h" /* For RETSIGTYPE */ # include "system.h" /* For RETSIGTYPE */

10
src/defaultfont.h
View File

@ -1,11 +1,11 @@
#ifndef _DEFAULTFONT_H_ #ifndef _DEFAULTFONT_H_
#define _DEFAULTFONT_H_ #define _DEFAULTFONT_H_
#if defined (NO_XLOCALE) || !defined(HAVE_X11_LOCALE_H) # ifdef HAVE_X11_LOCALE_H
# include <locale.h> # include <X11/Xlocale.h>
#else # else
# include <X11/Xlocale.h> # include <locale.h>
#endif # endif
#ifdef HAVE_NL_LANGINFO #ifdef HAVE_NL_LANGINFO
# include <langinfo.h> # include <langinfo.h>