procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(INLINE, RE_TRANSLATE_P): Move patches mistakenly committed to src/config.in.

Browse source
This commit is contained in:
Stefan Monnier 2004-12-07 15:42:19 +00:00
parent b11e882375
commit be5472bd83
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,6 +1,11 @@
2004-12-07 Stefan <monnier@iro.umontreal.ca>
* configure.in (INLINE, RE_TRANSLATE_P): Move patches mistakenly
committed to src/config.in.
2004-12-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: If $HAVE_GTK_FILE_CHOOSER = yes, check for
* configure.in: If $HAVE_GTK_FILE_CHOOSER = yes, check for
pthreads and define HAVE_GTK_AND_PTHREAD.
* configure: Regenerate.

15
configure.in
View file

@ -3,7 +3,7 @@ dnl To rebuild the `configure' script from this, execute the command
dnl autoconf
dnl in the directory containing this script.
dnl
dnl Copyright (C) 1994, 95, 96, 1999, 2000, 01, 02, 03, 2004
dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004
dnl Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Emacs.
@ -2767,7 +2767,8 @@ if test "${REL_ALLOC}" = "yes" ; then
fi
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 93, 94, 99, 2000, 2002 Free Software Foundation, Inc.
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -2848,7 +2849,7 @@ AH_BOTTOM([
/* Don't try to switch on inline handling as detected by AC_C_INLINE
generally, because even if non-gcc compilers accept `inline', they
may reject `extern inline'. */
#ifdef __GNUC__
#if defined (__GNUC__) && defined (OPTIMIZE)
#define INLINE __inline__
#else
#define INLINE
@ -2896,7 +2897,13 @@ AH_BOTTOM([
/* Tell regex.c to use a type compatible with Emacs. */
#define RE_TRANSLATE_TYPE Lisp_Object
#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
#define RE_TRANSLATE_P(TBL) (XFASTINT (TBL) != 0)
#ifdef make_number
/* If make_number is a macro, use it. */
#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
#else
/* If make_number is a function, avoid it. */
#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0))
#endif
#endif
/* Avoid link-time collision with system mktime if we will use our own. */