Only define CTRL_A-Z if _GEN_DEFS_H is not defined (prevent redefinition of

xpdev/gen_defs.h constants).

src/uifc/uifc.h

@@ -212,7 +212,7 @@
 
 #define HELPBUF_SIZE 4000
 
-#ifndef TAB
+#ifndef _GEN_DEFS_H
 									/* Control characters */
 #define STX 	0x02				/* Start of text			^B	*/
 #define ETX 	0x03				/* End of text				^C	*/
@@ -223,9 +223,7 @@
 #define CR		'\r'				/* Carriage return			^M	*/
 #define ESC 	0x1b				/* Escape					^[	*/
 #define DEL     0x7f                /* Delete                   ^BS */
-#endif
 
-#if !CTRL_A
 enum {
 	 CTRL_A=1
 	,CTRL_B
@@ -254,9 +252,8 @@ enum {
 	,CTRL_Y
 	,CTRL_Z
 };
-#endif
 
-#define CLREOL 256
+#endif
 
 #ifndef uchar				/* Short-hand for unsigned data types */
 #define uchar unsigned char