[Qemacs-commit] qemacs libfbf.c qe.h

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/18 16:25:08

Modified files:
        .              : libfbf.c qe.h 

Log message:
        use preprocessor trick to prevent gcc warning, add special key

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/libfbf.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.85&r2=1.86

Patches:
Index: libfbf.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libfbf.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libfbf.c    8 Jan 2008 16:37:54 -0000       1.9
+++ libfbf.c    18 Apr 2008 16:25:07 -0000      1.10
@@ -27,6 +27,7 @@
 
 #define free(ptr)    do_not_use_free
 #define malloc(size) do_not_use_malloc
+#define index  index__
 
 static void init_context_tables(void);
 static int unicode_to_johab(int code);

Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- qe.h        18 Apr 2008 14:39:07 -0000      1.85
+++ qe.h        18 Apr 2008 16:25:07 -0000      1.86
@@ -76,6 +76,9 @@
 #define ssizeof(a)  ((int)(sizeof(a)))
 #endif
 
+/* prevent gcc warning about shadowing a global declaration */
+#define index  index__
+
 /************************/
 
 #include "cutils.h"
@@ -533,7 +536,7 @@
 #define KEY_CTRLX(c)    ((c) | 0xe200)
 #define KEY_CTRLXRET(c) ((c) | 0xe300)
 #define KEY_CTRLH(c)    ((c) | 0xe500)
-#define KEY_SPECIAL(c)  (((c) >= 0xe000 && (c) < 0xf000) || ((c) >= 0 && (c) < 
32))
+#define KEY_SPECIAL(c)  (((c) >= 0xe000 && (c) < 0xf000) || ((c) >= 0 && (c) < 
32) || (c) == 127)
 
 #define KEY_NONE        0xffff
 #define KEY_DEFAULT     0xe401 /* to handle all non special keys */