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

34 files changed, 34 insertions, 34 deletions

diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index cea60d81..f54f5958 100644
--- 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
diff --git a/src/fe-common/core/autorun.c b/src/fe-common/core/autorun.c
index 506e45ff..b305b82e 100644
--- 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)
 {
diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 2a5e755f..7f1d771d 100644
--- 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 */
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index 8ed26757..9f37f069 100644
--- 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);
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 7f220752..bbe281f1 100644
--- 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"
 
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 2b04053f..c934954b 100644
--- 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"
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 50617981..b3c607ed 100644
--- 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 */
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 06841a6b..33b20f43 100644
--- 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"
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index dd15091c..81caf2c6 100644
--- 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"
 
diff --git a/src/fe-common/core/windows.c b/src/fe-common/core/fe-windows.c
index 88127452..7678c983 100644
--- a/src/fe-common/core/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,
diff --git a/src/fe-common/core/windows.h b/src/fe-common/core/fe-windows.h
index 16fff673..16fff673 100644
--- a/src/fe-common/core/windows.h
+++ b/src/fe-common/core/fe-windows.h
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 4b0df726..e6cedd1b 100644
--- 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"
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 5819353e..6a042156 100644
--- 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
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index a21c11c1..5c47edb9 100644
--- 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;
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 6019ba88..fe05298c 100644
--- 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;
diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index cc2ad2fb..d9e3ce79 100644
--- 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, ...);
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 96237e6a..7c90ec52 100644
--- 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"
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index b9ef8450..217f5166 100644
--- 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"
diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c
index f94bcc8c..8e36931d 100644
--- 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"
 
diff --git a/src/fe-common/core/window-items.h b/src/fe-common/core/window-items.h
index 8e22c449..0ed052ea 100644
--- 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);
diff --git a/src/fe-common/core/window-save.c b/src/fe-common/core/window-save.c
index 61d2bb5e..d9540c89 100644
--- 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,
diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index 9a06973d..8f685514 100644
--- 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"
diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index 02703883..2ed0feb4 100644
--- 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"
 
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 4e1c70f7..19086b40 100644
--- 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"
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index fe361ef9..c6fae677 100644
--- 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"
 
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 635391c4..cef890ff 100644
--- 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,
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index f7ca62bd..afc960c0 100644
--- 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"
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 7f4fd6f2..1e04c16b 100644
--- 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"
diff --git a/src/fe-text/gui-textwidget.c b/src/fe-text/gui-textwidget.c
index c691f63b..67f35882 100644
--- 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"
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index fefb9ae7..f17dec81 100644
--- 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"
diff --git a/src/fe-text/mainwindow-activity.c b/src/fe-text/mainwindow-activity.c
index 537bb6dd..e0a7d6ae 100644
--- 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)
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index f23aa8b7..fd56bd2b 100644
--- 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 {
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 0d316880..78a3b5f6 100644
--- 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"
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index 53501067..30f18efe 100644
--- 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"