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

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


SVN revision: 14227
eterm-0.10
Michael Jennings 18 years ago
parent d983ccb3c5
commit 4d779be4e2
  1. 4
      ChangeLog
  2. 5
      configure.in
  3. 5
      src/command.h
  4. 10
      src/defaultfont.h

@ -5313,3 +5313,7 @@ Fixed error in saving of cut_chars 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.
----------------------------------------------------------------------

@ -205,7 +205,7 @@ sys/ioctl.h sys/select.h sys/time.h \
sys/sockio.h sys/byteorder.h malloc.h \
utmpx.h unistd.h bsd/signal.h regex.h \
regexp.h stdarg.h X11/Xmu/Atoms.h \
X11/Sunkeysym.h)
X11/Sunkeysym.h X11/Xlocale.h)
AC_HEADER_TIME
dnl# Missing typedefs and replacements
@ -817,9 +817,6 @@ AC_ARG_ENABLE(xim,
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
#if test "$MULTICHAR_ENCODING" != "none"; then
AC_CHECK_LIB(Xmu, XmuInternAtom)

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

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

Loading…
Cancel
Save