[w3m-dev 02481] Re: #ifdef cleanup

From: Fumitoshi UKAI <ukai@debian.or.jp>

1 files changed, 14 insertions, 14 deletions

diff --git a/proto.h b/proto.h
index 651bb87..1cee030 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.5 2001/11/20 08:20:56 ukai Exp $ */
+/* $Id: proto.h,v 1.6 2001/11/21 19:24:35 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -190,7 +190,7 @@ extern void redrawNLine(Buffer * buf, int n);
 extern Line *redrawLine(Buffer * buf, Line * l, int i);
 extern int redrawLineRegion(Buffer * buf, Line * l, int i, int bpos, int epos);
 extern void do_effects(Lineprop m);
-#ifdef ANSI_COLOR
+#ifdef USE_ANSI_COLOR
 extern void do_color(Linecolor c);
 #endif
 extern void addChar(char c, Lineprop mode);
@@ -201,7 +201,7 @@ extern void message(char *s, int return_x, int return_y);
 #define disp_err_message(s, f) (record_err_message((s)), disp_message((s), (f)))
 extern void disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse);
 extern void disp_message(char *s, int redraw_current);
-#ifdef MOUSE
+#ifdef USE_MOUSE
 extern void disp_message_nomouse(char *s, int redraw_current);
 #else
 #define disp_message_nomouse disp_message
@@ -223,7 +223,7 @@ extern Line *currentLineSkip(Buffer * buf, Line * line, int offset, int last);
 extern int gethtmlcmd(char **s, int *status);
 extern char *getAnchor(char *arg, char **arg_return);
 extern Str checkType(Str s, Lineprop * oprop,
-#ifdef ANSI_COLOR
+#ifdef USE_ANSI_COLOR
 		     Linecolor * ocolor, int * check_color,
 #endif
 		     int len);
@@ -325,12 +325,12 @@ extern void underlineend(void);
 extern void graphstart(void);
 extern void graphend(void);
 extern int graph_ok(void);
-#ifdef COLOR
+#ifdef USE_COLOR
 extern void setfcolor(int color);
-#ifdef BG_COLOR
+#ifdef USE_BG_COLOR
 extern void setbcolor(int color);
-#endif				/* BG_COLOR */
-#endif				/* COLOR */
+#endif				/* USE_BG_COLOR */
+#endif				/* USE_COLOR */
 extern void refresh(void);
 extern void clear(void);
 extern void scroll(int);
@@ -473,17 +473,17 @@ extern void reMark(void);
 #define reMark nulcmd
 #endif				/* not USE_MARK */
 
-#ifdef MOUSE
+#ifdef USE_MOUSE
 extern void mouse(void);
 extern void mouse_init(void);
 extern void mouse_end(void);
 extern void mouse_active(void);
 extern void mouse_inactive(void);
 extern void msToggle(void);
-#else				/* not MOUSE */
+#else				/* not USE_MOUSE */
 #define mouse nulcmd
 #define msToggle nulcmd
-#endif				/* not MOUSE */
+#endif				/* not USE_MOUSE */
 
 extern char *searchKeyData(void);
 
@@ -496,7 +496,7 @@ extern KeyListItem *searchKeyList(KeyList *list, int key);
 extern char *getWord(char **str);
 extern char *getQWord(char **str);
 
-#ifdef MENU
+#ifdef USE_MENU
 extern void new_menu(Menu * menu, MenuItem * item);
 extern void geom_menu(Menu * menu, int x, int y, int select);
 extern void draw_all_menu(Menu * menu);
@@ -521,10 +521,10 @@ extern void mainMn(void);
 extern void selMn(void);
 extern void optionMenu(int x, int y, char **label, int *variable, int initial, void (*func) ());
 extern void initMenu(void);
-#else				/* not MENU */
+#else				/* not USE_MENU */
 #define mainMn nulcmd
 #define selMn selBuf
-#endif				/* not MENU */
+#endif				/* not USE_MENU */
 
 #ifdef DICT
 extern void dictword(void);