diff options
| author | Glenn Morris | 2011-02-12 18:07:25 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-12 18:07:25 -0800 |
| commit | c9a6cefc7adc3f42f36fdeaa6ab90f174a645d0e (patch) | |
| tree | c746a5098b38e3cd914999fd6317999bc364bf37 | |
| parent | 57e96f8e22b8d05a498be8f73366c8554c1b68e5 (diff) | |
| download | emacs-c9a6cefc7adc3f42f36fdeaa6ab90f174a645d0e.tar.gz emacs-c9a6cefc7adc3f42f36fdeaa6ab90f174a645d0e.zip | |
lwlib trivia.
* lwlib/lwlib-utils.c (index, rindex): Don't undef (neither used in lwlib/,
nor set in config.h).
| -rw-r--r-- | lwlib/ChangeLog | 5 | ||||
| -rw-r--r-- | lwlib/lwlib-utils.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 60defac0b18..997cefc4f95 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-02-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * lwlib-utils.c (index, rindex): Don't undef (neither used in lwlib/, | ||
| 4 | nor set in config.h). | ||
| 5 | |||
| 1 | 2011-02-11 Glenn Morris <rgm@gnu.org> | 6 | 2011-02-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in (USE_X_TOOLKIT, RM, TOOLKIT_DEFINES): Remove. | 8 | * Makefile.in (USE_X_TOOLKIT, RM, TOOLKIT_DEFINES): Remove. |
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c index 7c9a56d2aeb..a3e1cb3b432 100644 --- a/lwlib/lwlib-utils.c +++ b/lwlib/lwlib-utils.c | |||
| @@ -24,13 +24,6 @@ Boston, MA 02110-1301, USA. */ | |||
| 24 | #include <config.h> | 24 | #include <config.h> |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | /* Definitions of these in config.h can cause | ||
| 28 | declaration conflicts later on between declarations for index | ||
| 29 | and declarations for strchr. This file doesn't use | ||
| 30 | index and rindex, so cancel them. */ | ||
| 31 | #undef index | ||
| 32 | #undef rindex | ||
| 33 | |||
| 34 | #include <setjmp.h> | 27 | #include <setjmp.h> |
| 35 | #include <lisp.h> | 28 | #include <lisp.h> |
| 36 | 29 | ||