windows.h conflicted with microsoft's windows.h :) renamed windows.[ch] to

fe-windows.[ch] git-svn-id: http://svn.irssi.org/repos/irssi/trunk@846 dbcabf3a-b0e7-0310-adc4-f8d773084564
2000-11-17 16:27:14 +00:00 · 2000-11-17 16:27:14 +00:00 · 39630c3d58
commit 39630c3d58
parent 2edcdd715f
34 changed files with 34 additions and 34 deletions
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@ -33,7 +33,7 @@ libfe_common_core_a_SOURCES = \
 	window-commands.c \
 	window-items.c \
 	window-save.c \
-	windows.c
+	fe-windows.c

 noinst_HEADERS = \
 	command-history.h \
@ -50,4 +50,4 @@ noinst_HEADERS = \
 	translation.h \
 	window-items.h \
 	window-save.h \
-	windows.h
+	fe-windows.h
--- a/src/fe-common/core/autorun.c
+++ b/src/fe-common/core/autorun.c
@ -23,7 +23,7 @@
 #include "line-split.h"
 #include "special-vars.h"

-#include "windows.h"
+#include "fe-windows.h"

 static void sig_autorun(void)
 {
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@ -24,7 +24,7 @@
 #include "special-vars.h"
 #include "settings.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"

 /* command history */
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@ -1,7 +1,7 @@
 #ifndef __COMMAND_HISTORY_H
 #define __COMMAND_HISTORY_H

-#include "windows.h"
+#include "fe-windows.h"

 void command_history_init(void);
 void command_history_deinit(void);
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@ -30,7 +30,7 @@
 #include "channels-setup.h"
 #include "nicklist.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "printtext.h"

--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@ -32,7 +32,7 @@
 #include "formats.h"
 #include "themes.h"
 #include "translation.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "window-save.h"

--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@ -28,7 +28,7 @@
 #include "settings.h"
 #include "irssi-version.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "printtext.h"

 #define PASTE_CHECK_SPEED 200 /* 0.2 sec */
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@ -29,7 +29,7 @@
 #include "special-vars.h"
 #include "settings.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "formats.h"
 #include "themes.h"
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@ -28,7 +28,7 @@
 #include "levels.h"
 #include "queries.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "printtext.h"

--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@ -30,7 +30,7 @@
 #include "levels.h"

 #include "printtext.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"

 GSList *windows; /* first in the list is the active window,
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@ -26,7 +26,7 @@

 #include "levels.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "formats.h"
 #include "themes.h"
 #include "translation.h"
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@ -2,7 +2,7 @@
 #define __FORMATS_H

 #include "themes.h"
-#include "windows.h"
+#include "fe-windows.h"

 #define PRINTFLAG_BOLD          0x01
 #define PRINTFLAG_REVERSE       0x02
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@ -28,7 +28,7 @@
 #include "settings.h"

 #include "keyboard.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "printtext.h"

 GSList *keyinfos;
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@ -29,7 +29,7 @@
 #include "servers.h"

 #include "themes.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "printtext.h"

 static int beep_msg_level, beep_when_away;
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@ -1,7 +1,7 @@
 #ifndef __PRINTTEXT_H
 #define __PRINTTEXT_H

-#include "windows.h"
+#include "fe-windows.h"

 void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...);
 void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@ -25,7 +25,7 @@
 #include "misc.h"
 #include "settings.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "nicklist.h"
 #include "hilight-text.h"
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@ -28,7 +28,7 @@
 #include "levels.h"

 #include "themes.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "window-save.h"
 #include "printtext.h"
--- a/src/fe-common/core/window-items.c
+++ b/src/fe-common/core/window-items.c
@ -27,7 +27,7 @@

 #include "levels.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "printtext.h"

--- a/src/fe-common/core/window-items.h
+++ b/src/fe-common/core/window-items.h
@ -1,7 +1,7 @@
 #ifndef __WINDOW_ITEMS_H
 #define __WINDOW_ITEMS_H

-#include "windows.h"
+#include "fe-windows.h"

 /* Add/remove window item from `window' */
 void window_add_item(WINDOW_REC *window, WI_ITEM_REC *item, int automatic);
--- a/src/fe-common/core/window-save.c
+++ b/src/fe-common/core/window-save.c
@ -30,7 +30,7 @@
 #include "queries.h"

 #include "themes.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"

 static void sig_window_restore_item(WINDOW_REC *window, const char *type,
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@ -33,7 +33,7 @@

 #include "completion.h"
 #include "themes.h"
-#include "windows.h"
+#include "fe-windows.h"

 #include "module-formats.h"
 #include "printtext.h"
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@ -30,7 +30,7 @@
 #include "queries.h"
 #include "ignore.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "printtext.h"

--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@ -35,7 +35,7 @@
 #include "fe-queries.h"
 #include "irc-channels.h"
 #include "irc-nicklist.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "printtext.h"

 #include "completion.h"
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@ -34,7 +34,7 @@
 #include "irc-queries.h"

 #include "fe-queries.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "printtext.h"

--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@ -31,7 +31,7 @@
 #include "servers-reconnect.h"
 #include "irc-servers-setup.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "printtext.h"

 static void sig_server_add_create(IRC_SERVER_SETUP_REC **rec,
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@ -23,7 +23,7 @@
 #include "commands.h"
 #include "settings.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "formats.h"
 #include "printtext.h"
 #include "themes.h"
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@ -27,7 +27,7 @@
 #include "command-history.h"
 #include "keyboard.h"
 #include "translation.h"
-#include "windows.h"
+#include "fe-windows.h"

 #include "screen.h"
 #include "gui-entry.h"
--- a/src/fe-text/gui-textwidget.c
+++ b/src/fe-text/gui-textwidget.c
@ -27,7 +27,7 @@
 #include "settings.h"

 #include "irc-servers.h"
-#include "windows.h"
+#include "fe-windows.h"
 #include "printtext.h"

 #include "screen.h"
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@ -27,7 +27,7 @@

 #include "irc.h"
 #include "channels.h"
-#include "windows.h"
+#include "fe-windows.h"

 #include "screen.h"
 #include "gui-entry.h"
--- a/src/fe-text/mainwindow-activity.c
+++ b/src/fe-text/mainwindow-activity.c
@ -21,7 +21,7 @@
 #include "module.h"
 #include "signals.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "gui-windows.h"

 static void sig_activity(WINDOW_REC *window)
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@ -1,7 +1,7 @@
 #ifndef __MAINWINDOWS_H
 #define __MAINWINDOWS_H

-#include "windows.h"
+#include "fe-windows.h"
 #include "screen.h"

 typedef struct {
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@ -30,7 +30,7 @@
 #include "irc-servers.h"
 #include "nicklist.h"

-#include "windows.h"
+#include "fe-windows.h"
 #include "window-items.h"
 #include "printtext.h"
 #include "formats.h"
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@ -23,7 +23,7 @@
 #include "servers.h"
 #include "settings.h"

-#include "windows.h"
+#include "fe-windows.h"

 #include "screen.h"
 #include "statusbar.h"