summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/ChangeLog5
-rw-r--r--lwlib/lwlib-utils.c7
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 @@
+2011-02-13 Glenn Morris <rgm@gnu.org>
+
+ * lwlib-utils.c (index, rindex): Don't undef (neither used in lwlib/,
+ nor set in config.h).
+
2011-02-11 Glenn Morris <rgm@gnu.org>
* 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. */
#include <config.h>
#endif
-/* Definitions of these in config.h can cause
- declaration conflicts later on between declarations for index
- and declarations for strchr. This file doesn't use
- index and rindex, so cancel them. */
-#undef index
-#undef rindex
-
#include <setjmp.h>
#include <lisp.h>