From 37f7c7f37489122e6ec4f870af428f7675042dfd Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 1 May 2019 22:22:22 +0200 Subject: [PATCH] update include guard names --- src/common.h | 4 ++-- src/core/args.h | 4 ++-- src/core/capsicum.h | 6 +++--- src/core/channels-setup.h | 4 ++-- src/core/channels.h | 4 ++-- src/core/chat-protocols.h | 4 ++-- src/core/chatnets.h | 4 ++-- src/core/commands.h | 4 ++-- src/core/core.h | 4 ++-- src/core/expandos.h | 4 ++-- src/core/ignore.h | 4 ++-- src/core/iregex.h | 4 ++-- src/core/levels.h | 4 ++-- src/core/line-split.h | 4 ++-- src/core/log.h | 4 ++-- src/core/masks.h | 4 ++-- src/core/misc.h | 4 ++-- src/core/modules-load.h | 4 ++-- src/core/modules.h | 4 ++-- src/core/net-disconnect.h | 4 ++-- src/core/net-nonblock.h | 4 ++-- src/core/net-sendbuffer.h | 4 ++-- src/core/network-openssl.h | 6 +++--- src/core/network.h | 4 ++-- src/core/nicklist.h | 4 ++-- src/core/nickmatch-cache.h | 4 ++-- src/core/pidwait.h | 4 ++-- src/core/queries.h | 4 ++-- src/core/rawlog.h | 4 ++-- src/core/recode.h | 6 +++--- src/core/servers-reconnect.h | 4 ++-- src/core/servers-setup.h | 4 ++-- src/core/servers.h | 4 ++-- src/core/session.h | 4 ++-- src/core/settings.h | 4 ++-- src/core/signals.h | 4 ++-- src/core/special-vars.h | 4 ++-- src/core/tls.h | 4 ++-- src/core/utf8.h | 4 ++-- src/core/window-item-def.h | 4 ++-- src/core/write-buffer.h | 4 ++-- src/fe-common/core/chat-completion.h | 4 ++-- src/fe-common/core/command-history.h | 4 ++-- src/fe-common/core/completion.h | 4 ++-- src/fe-common/core/fe-capsicum.h | 4 ++-- src/fe-common/core/fe-channels.h | 4 ++-- src/fe-common/core/fe-common-core.h | 4 ++-- src/fe-common/core/fe-core-commands.h | 4 ++-- src/fe-common/core/fe-exec.h | 4 ++-- src/fe-common/core/fe-messages.h | 4 ++-- src/fe-common/core/fe-queries.h | 4 ++-- src/fe-common/core/fe-recode.h | 6 +++--- src/fe-common/core/fe-settings.h | 4 ++-- src/fe-common/core/fe-tls.h | 4 ++-- src/fe-common/core/fe-windows.h | 4 ++-- src/fe-common/core/formats.h | 4 ++-- src/fe-common/core/hilight-text.h | 4 ++-- src/fe-common/core/keyboard.h | 4 ++-- src/fe-common/core/printtext.h | 4 ++-- src/fe-common/core/themes.h | 4 ++-- src/fe-common/core/window-activity.h | 4 ++-- src/fe-common/core/window-items.h | 4 ++-- src/fe-common/core/windows-layout.h | 4 ++-- src/fe-common/irc/dcc/fe-dcc.h | 4 ++-- src/fe-common/irc/fe-irc-channels.h | 4 ++-- src/fe-common/irc/fe-irc-server.h | 4 ++-- src/fe-text/gui-entry.h | 4 ++-- src/fe-text/gui-printtext.h | 4 ++-- src/fe-text/gui-readline.h | 4 ++-- src/fe-text/gui-windows.h | 4 ++-- src/fe-text/mainwindows.h | 4 ++-- src/fe-text/statusbar-config.h | 4 ++-- src/fe-text/statusbar.h | 4 ++-- src/fe-text/term.h | 4 ++-- src/fe-text/terminfo-core.h | 4 ++-- src/fe-text/textbuffer-view.h | 4 ++-- src/fe-text/textbuffer.h | 4 ++-- src/irc/core/bans.h | 4 ++-- src/irc/core/channel-events.h | 4 ++-- src/irc/core/channel-rejoin.h | 4 ++-- src/irc/core/ctcp.h | 4 ++-- src/irc/core/irc-cap.h | 4 ++-- src/irc/core/irc-channels.h | 4 ++-- src/irc/core/irc-chatnets.h | 4 ++-- src/irc/core/irc-commands.h | 4 ++-- src/irc/core/irc-masks.h | 4 ++-- src/irc/core/irc-nicklist.h | 4 ++-- src/irc/core/irc-queries.h | 4 ++-- src/irc/core/irc-servers-setup.h | 4 ++-- src/irc/core/irc-servers.h | 4 ++-- src/irc/core/irc.h | 4 ++-- src/irc/core/mode-lists.h | 4 ++-- src/irc/core/modes.h | 4 ++-- src/irc/core/netsplit.h | 4 ++-- src/irc/core/sasl.h | 4 ++-- src/irc/core/servers-idle.h | 4 ++-- src/irc/core/servers-redirect.h | 4 ++-- src/irc/dcc/dcc-chat.h | 4 ++-- src/irc/dcc/dcc-file.h | 4 ++-- src/irc/dcc/dcc-get.h | 4 ++-- src/irc/dcc/dcc-queue.h | 4 ++-- src/irc/dcc/dcc-send.h | 4 ++-- src/irc/dcc/dcc-server.h | 4 ++-- src/irc/dcc/dcc.h | 4 ++-- src/irc/flood/autoignore.h | 4 ++-- src/irc/flood/flood.h | 4 ++-- src/irc/notifylist/notify-setup.h | 4 ++-- src/irc/notifylist/notifylist.h | 4 ++-- src/irc/proxy/proxy.h | 4 ++-- src/lib-config/iconfig.h | 4 ++-- src/perl/perl-common.h | 4 ++-- src/perl/perl-core.h | 4 ++-- src/perl/perl-signals.h | 4 ++-- src/perl/perl-sources.h | 4 ++-- 114 files changed, 232 insertions(+), 232 deletions(-) diff --git a/src/common.h b/src/common.h index 313b2c9f..ef4b0c15 100644 --- a/src/common.h +++ b/src/common.h @@ -1,5 +1,5 @@ -#ifndef __COMMON_H -#define __COMMON_H +#ifndef IRSSI_COMMON_H +#define IRSSI_COMMON_H #define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */ diff --git a/src/core/args.h b/src/core/args.h index bbe16b5f..aeaf5714 100644 --- a/src/core/args.h +++ b/src/core/args.h @@ -1,5 +1,5 @@ -#ifndef __ARGS_H -#define __ARGS_H +#ifndef IRSSI_CORE_ARGS_H +#define IRSSI_CORE_ARGS_H void args_register(GOptionEntry *options); void args_execute(int argc, char *argv[]); diff --git a/src/core/capsicum.h b/src/core/capsicum.h index 7d89f2aa..ab980a43 100644 --- a/src/core/capsicum.h +++ b/src/core/capsicum.h @@ -1,5 +1,5 @@ -#ifndef __CAPSICUM_H -#define __CAPSICUM_H +#ifndef IRSSI_CORE_CAPSICUM_H +#define IRSSI_CORE_CAPSICUM_H gboolean capsicum_enabled(void); int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip); @@ -12,4 +12,4 @@ void capsicum_mkdir_with_parents_wrapper(const char *path, int mode); void capsicum_init(void); void capsicum_deinit(void); -#endif /* !__CAPSICUM_H */ +#endif /* !IRSSI_CORE_CAPSICUM_H */ diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h index fcc099c6..c0297aec 100644 --- a/src/core/channels-setup.h +++ b/src/core/channels-setup.h @@ -1,5 +1,5 @@ -#ifndef __CHANNELS_SETUP_H -#define __CHANNELS_SETUP_H +#ifndef IRSSI_CORE_CHANNELS_SETUP_H +#define IRSSI_CORE_CHANNELS_SETUP_H #include diff --git a/src/core/channels.h b/src/core/channels.h index 276c69fa..197d2254 100644 --- a/src/core/channels.h +++ b/src/core/channels.h @@ -1,5 +1,5 @@ -#ifndef __CHANNELS_H -#define __CHANNELS_H +#ifndef IRSSI_CORE_CHANNELS_H +#define IRSSI_CORE_CHANNELS_H #include diff --git a/src/core/chat-protocols.h b/src/core/chat-protocols.h index 8b7dc170..ab7327bd 100644 --- a/src/core/chat-protocols.h +++ b/src/core/chat-protocols.h @@ -1,5 +1,5 @@ -#ifndef __CHAT_PROTOCOLS_H -#define __CHAT_PROTOCOLS_H +#ifndef IRSSI_CORE_CHAT_PROTOCOLS_H +#define IRSSI_CORE_CHAT_PROTOCOLS_H struct _CHAT_PROTOCOL_REC { int id; diff --git a/src/core/chatnets.h b/src/core/chatnets.h index 785b487e..6f36fe33 100644 --- a/src/core/chatnets.h +++ b/src/core/chatnets.h @@ -1,5 +1,5 @@ -#ifndef __CHATNETS_H -#define __CHATNETS_H +#ifndef IRSSI_CORE_CHATNETS_H +#define IRSSI_CORE_CHATNETS_H #include diff --git a/src/core/commands.h b/src/core/commands.h index b70e77ca..7c6bd87b 100644 --- a/src/core/commands.h +++ b/src/core/commands.h @@ -1,5 +1,5 @@ -#ifndef __COMMANDS_H -#define __COMMANDS_H +#ifndef IRSSI_CORE_COMMANDS_H +#define IRSSI_CORE_COMMANDS_H #include diff --git a/src/core/core.h b/src/core/core.h index 406070e0..6c6c7b61 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,5 +1,5 @@ -#ifndef __IRSSI_CORE_H -#define __IRSSI_CORE_H +#ifndef IRSSI_CORE_CORE_H +#define IRSSI_CORE_CORE_H #include diff --git a/src/core/expandos.h b/src/core/expandos.h index 3466a44a..05dfcf11 100644 --- a/src/core/expandos.h +++ b/src/core/expandos.h @@ -1,5 +1,5 @@ -#ifndef __EXPANDOS_H -#define __EXPANDOS_H +#ifndef IRSSI_CORE_EXPANDOS_H +#define IRSSI_CORE_EXPANDOS_H #include diff --git a/src/core/ignore.h b/src/core/ignore.h index fea38205..bf55a76b 100644 --- a/src/core/ignore.h +++ b/src/core/ignore.h @@ -1,5 +1,5 @@ -#ifndef __IGNORE_H -#define __IGNORE_H +#ifndef IRSSI_CORE_IGNORE_H +#define IRSSI_CORE_IGNORE_H #include diff --git a/src/core/iregex.h b/src/core/iregex.h index d6d6c17f..53263944 100644 --- a/src/core/iregex.h +++ b/src/core/iregex.h @@ -1,5 +1,5 @@ -#ifndef __REGEX_H -#define __REGEX_H +#ifndef IRSSI_CORE_IREGEX_H +#define IRSSI_CORE_IREGEX_H #include diff --git a/src/core/levels.h b/src/core/levels.h index b0ebafba..385ecd0c 100644 --- a/src/core/levels.h +++ b/src/core/levels.h @@ -1,5 +1,5 @@ -#ifndef __LEVELS_H -#define __LEVELS_H +#ifndef IRSSI_CORE_LEVELS_H +#define IRSSI_CORE_LEVELS_H /* This is pretty much IRC specific, but I think it would be easier for other chats to try to use these same levels instead of implementing too diff --git a/src/core/line-split.h b/src/core/line-split.h index 7c101ddd..cf957423 100644 --- a/src/core/line-split.h +++ b/src/core/line-split.h @@ -1,5 +1,5 @@ -#ifndef __LINE_SPLIT_H -#define __LINE_SPLIT_H +#ifndef IRSSI_CORE_LINE_SPLIT_H +#define IRSSI_CORE_LINE_SPLIT_H /* line-split `data'. Initially `*buffer' should contain NULL. */ int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer); diff --git a/src/core/log.h b/src/core/log.h index 5a07859b..1c529670 100644 --- a/src/core/log.h +++ b/src/core/log.h @@ -1,5 +1,5 @@ -#ifndef __LOG_H -#define __LOG_H +#ifndef IRSSI_CORE_LOG_H +#define IRSSI_CORE_LOG_H enum { LOG_ITEM_TARGET, /* channel, query, .. */ diff --git a/src/core/masks.h b/src/core/masks.h index b6ce20d8..e3a0437a 100644 --- a/src/core/masks.h +++ b/src/core/masks.h @@ -1,5 +1,5 @@ -#ifndef __MASKS_H -#define __MASKS_H +#ifndef IRSSI_CORE_MASKS_H +#define IRSSI_CORE_MASKS_H int mask_match(SERVER_REC *server, const char *mask, const char *nick, const char *user, const char *host); diff --git a/src/core/misc.h b/src/core/misc.h index 1545f7a2..9e06c707 100644 --- a/src/core/misc.h +++ b/src/core/misc.h @@ -1,5 +1,5 @@ -#ifndef __MISC_H -#define __MISC_H +#ifndef IRSSI_CORE_MISC_H +#define IRSSI_CORE_MISC_H int g_input_add_poll(int fd, int priority, int condition, GInputFunction function, void *data); diff --git a/src/core/modules-load.h b/src/core/modules-load.h index 683d30e3..a99bcdfe 100644 --- a/src/core/modules-load.h +++ b/src/core/modules-load.h @@ -1,5 +1,5 @@ -#ifndef __MODULES_LOAD_H -#define __MODULES_LOAD_H +#ifndef IRSSI_CORE_MODULES_LOAD_H +#define IRSSI_CORE_MODULES_LOAD_H #include diff --git a/src/core/modules.h b/src/core/modules.h index b2fa2fa4..e3deaee2 100644 --- a/src/core/modules.h +++ b/src/core/modules.h @@ -1,5 +1,5 @@ -#ifndef __MODULES_H -#define __MODULES_H +#ifndef IRSSI_CORE_MODULES_H +#define IRSSI_CORE_MODULES_H #define MODULE_DATA_INIT(rec) \ (rec)->module_data = g_hash_table_new(g_str_hash, g_str_equal) diff --git a/src/core/net-disconnect.h b/src/core/net-disconnect.h index 37a46846..78b03c16 100644 --- a/src/core/net-disconnect.h +++ b/src/core/net-disconnect.h @@ -1,5 +1,5 @@ -#ifndef __NET_DISCONNECT_H -#define __NET_DISCONNECT_H +#ifndef IRSSI_CORE_NET_DISCONNECT_H +#define IRSSI_CORE_NET_DISCONNECT_H /* Try to let the other side close the connection, if it still isn't disconnected after certain amount of time, close it ourself */ diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h index 649232ae..086c9dab 100644 --- a/src/core/net-nonblock.h +++ b/src/core/net-nonblock.h @@ -1,5 +1,5 @@ -#ifndef __NET_NONBLOCK_H -#define __NET_NONBLOCK_H +#ifndef IRSSI_CORE_NET_NONBLOCK_H +#define IRSSI_CORE_NET_NONBLOCK_H #include diff --git a/src/core/net-sendbuffer.h b/src/core/net-sendbuffer.h index bdeb7156..7cf1ef6d 100644 --- a/src/core/net-sendbuffer.h +++ b/src/core/net-sendbuffer.h @@ -1,5 +1,5 @@ -#ifndef __NET_SENDBUFFER_H -#define __NET_SENDBUFFER_H +#ifndef IRSSI_CORE_NET_SENDBUFFER_H +#define IRSSI_CORE_NET_SENDBUFFER_H #define DEFAULT_BUFFER_SIZE 8192 #define MAX_BUFFER_SIZE 1048576 diff --git a/src/core/network-openssl.h b/src/core/network-openssl.h index 4cd6d711..2c204fb8 100644 --- a/src/core/network-openssl.h +++ b/src/core/network-openssl.h @@ -1,6 +1,6 @@ -#ifndef __NETWORK_OPENSSL_H -#define __NETWORK_OPENSSL_H +#ifndef IRSSI_CORE_NETWORK_OPENSSL_H +#define IRSSI_CORE_NETWORK_OPENSSL_H gboolean irssi_ssl_init(void); -#endif /* !__NETWORK_OPENSSL_H */ +#endif /* !IRSSI_CORE_NETWORK_OPENSSL_H */ diff --git a/src/core/network.h b/src/core/network.h index 30fd6aab..1776005d 100644 --- a/src/core/network.h +++ b/src/core/network.h @@ -1,5 +1,5 @@ -#ifndef __NETWORK_H -#define __NETWORK_H +#ifndef IRSSI_CORE_NETWORK_H +#define IRSSI_CORE_NETWORK_H #ifdef HAVE_SOCKS_H #include diff --git a/src/core/nicklist.h b/src/core/nicklist.h index 913cc0d1..62afa5ff 100644 --- a/src/core/nicklist.h +++ b/src/core/nicklist.h @@ -1,5 +1,5 @@ -#ifndef __NICKLIST_H -#define __NICKLIST_H +#ifndef IRSSI_CORE_NICKLIST_H +#define IRSSI_CORE_NICKLIST_H /* Returns NICK_REC if it's nick, NULL if it isn't. */ #define NICK(server) \ diff --git a/src/core/nickmatch-cache.h b/src/core/nickmatch-cache.h index c4140a49..ff58d853 100644 --- a/src/core/nickmatch-cache.h +++ b/src/core/nickmatch-cache.h @@ -1,5 +1,5 @@ -#ifndef __NICKMATCH_CACHE_H -#define __NICKMATCH_CACHE_H +#ifndef IRSSI_CORE_NICKMATCH_CACHE_H +#define IRSSI_CORE_NICKMATCH_CACHE_H typedef void (*NICKMATCH_REBUILD_FUNC) (GHashTable *list, CHANNEL_REC *channel, NICK_REC *nick); diff --git a/src/core/pidwait.h b/src/core/pidwait.h index ae1ba01e..148c65d7 100644 --- a/src/core/pidwait.h +++ b/src/core/pidwait.h @@ -1,5 +1,5 @@ -#ifndef __PIDWAIT_H -#define __PIDWAIT_H +#ifndef IRSSI_CORE_PIDWAIT_H +#define IRSSI_CORE_PIDWAIT_H void pidwait_init(void); void pidwait_deinit(void); diff --git a/src/core/queries.h b/src/core/queries.h index 16f92588..c6170361 100644 --- a/src/core/queries.h +++ b/src/core/queries.h @@ -1,5 +1,5 @@ -#ifndef __QUERIES_H -#define __QUERIES_H +#ifndef IRSSI_CORE_QUERIES_H +#define IRSSI_CORE_QUERIES_H #include diff --git a/src/core/rawlog.h b/src/core/rawlog.h index 01175e67..53c0d3c3 100644 --- a/src/core/rawlog.h +++ b/src/core/rawlog.h @@ -1,5 +1,5 @@ -#ifndef __RAWLOG_H -#define __RAWLOG_H +#ifndef IRSSI_CORE_RAWLOG_H +#define IRSSI_CORE_RAWLOG_H struct _RAWLOG_REC { int logging; diff --git a/src/core/recode.h b/src/core/recode.h index 719e8f54..ce1b9daf 100644 --- a/src/core/recode.h +++ b/src/core/recode.h @@ -1,5 +1,5 @@ -#ifndef __RECODE_H -#define __RECODE_H +#ifndef IRSSI_CORE_RECODE_H +#define IRSSI_CORE_RECODE_H char *recode_in (const SERVER_REC *server, const char *str, const char *target); char *recode_out (const SERVER_REC *server, const char *str, const char *target); @@ -12,4 +12,4 @@ void recode_update_charset(void); void recode_init (void); void recode_deinit (void); -#endif /* __RECODE_H */ +#endif /* IRSSI_CORE_RECODE_H */ diff --git a/src/core/servers-reconnect.h b/src/core/servers-reconnect.h index 835d58d5..b98f5176 100644 --- a/src/core/servers-reconnect.h +++ b/src/core/servers-reconnect.h @@ -1,5 +1,5 @@ -#ifndef __SERVER_RECONNECT_H -#define __SERVER_RECONNECT_H +#ifndef IRSSI_CORE_SERVERS_RECONNECT_H +#define IRSSI_CORE_SERVERS_RECONNECT_H /* wait for half an hour before trying to reconnect to host where last connection failed */ diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h index 9bedfe25..296a94fa 100644 --- a/src/core/servers-setup.h +++ b/src/core/servers-setup.h @@ -1,5 +1,5 @@ -#ifndef __SERVERS_SETUP_H -#define __SERVERS_SETUP_H +#ifndef IRSSI_CORE_SERVERS_SETUP_H +#define IRSSI_CORE_SERVERS_SETUP_H #include diff --git a/src/core/servers.h b/src/core/servers.h index daf155b3..7b998c8d 100644 --- a/src/core/servers.h +++ b/src/core/servers.h @@ -1,5 +1,5 @@ -#ifndef __SERVERS_H -#define __SERVERS_H +#ifndef IRSSI_CORE_SERVERS_H +#define IRSSI_CORE_SERVERS_H #include diff --git a/src/core/session.h b/src/core/session.h index a3c8d67c..28c5cec8 100644 --- a/src/core/session.h +++ b/src/core/session.h @@ -1,5 +1,5 @@ -#ifndef __SESSION_H -#define __SESSION_H +#ifndef IRSSI_CORE_SESSION_H +#define IRSSI_CORE_SESSION_H extern char *irssi_binary; diff --git a/src/core/settings.h b/src/core/settings.h index b67a9e44..3a8a4646 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -1,5 +1,5 @@ -#ifndef __SETTINGS_H -#define __SETTINGS_H +#ifndef IRSSI_CORE_SETTINGS_H +#define IRSSI_CORE_SETTINGS_H typedef enum { SETTING_TYPE_STRING, diff --git a/src/core/signals.h b/src/core/signals.h index 384af66f..0fa005a1 100644 --- a/src/core/signals.h +++ b/src/core/signals.h @@ -1,5 +1,5 @@ -#ifndef __SIGNAL_H -#define __SIGNAL_H +#ifndef IRSSI_CORE_SIGNALS_H +#define IRSSI_CORE_SIGNALS_H #define SIGNAL_PRIORITY_LOW 100 #define SIGNAL_PRIORITY_DEFAULT 0 diff --git a/src/core/special-vars.h b/src/core/special-vars.h index caec5ec0..f4bd926d 100644 --- a/src/core/special-vars.h +++ b/src/core/special-vars.h @@ -1,5 +1,5 @@ -#ifndef __SPECIAL_VARS_H -#define __SPECIAL_VARS_H +#ifndef IRSSI_CORE_SPECIAL_VARS_H +#define IRSSI_CORE_SPECIAL_VARS_H #include diff --git a/src/core/tls.h b/src/core/tls.h index 9ba4ac47..791bde86 100644 --- a/src/core/tls.h +++ b/src/core/tls.h @@ -16,8 +16,8 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#ifndef __TLS_H -#define __TLS_H +#ifndef IRSSI_CORE_TLS_H +#define IRSSI_CORE_TLS_H #include diff --git a/src/core/utf8.h b/src/core/utf8.h index 9f7d1aaa..372c5d27 100644 --- a/src/core/utf8.h +++ b/src/core/utf8.h @@ -1,5 +1,5 @@ -#ifndef __UTF8_H -#define __UTF8_H +#ifndef IRSSI_CORE_UTF8_H +#define IRSSI_CORE_UTF8_H /* XXX I didn't check the encoding range of big5+. This is standard big5. */ #define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */ diff --git a/src/core/window-item-def.h b/src/core/window-item-def.h index 1309f975..6944c921 100644 --- a/src/core/window-item-def.h +++ b/src/core/window-item-def.h @@ -1,5 +1,5 @@ -#ifndef __WINDOW_ITEM_DEF_H -#define __WINDOW_ITEM_DEF_H +#ifndef IRSSI_CORE_WINDOW_ITEM_DEF_H +#define IRSSI_CORE_WINDOW_ITEM_DEF_H #define STRUCT_SERVER_REC SERVER_REC struct _WI_ITEM_REC { diff --git a/src/core/write-buffer.h b/src/core/write-buffer.h index ef527440..8c60dc77 100644 --- a/src/core/write-buffer.h +++ b/src/core/write-buffer.h @@ -1,5 +1,5 @@ -#ifndef __WRITE_BUFFER_H -#define __WRITE_BUFFER_H +#ifndef IRSSI_CORE_WRITE_BUFFER_H +#define IRSSI_CORE_WRITE_BUFFER_H int write_buffer(int handle, const void *data, int size); void write_buffer_flush(void); diff --git a/src/fe-common/core/chat-completion.h b/src/fe-common/core/chat-completion.h index 17c1408d..2976b962 100644 --- a/src/fe-common/core/chat-completion.h +++ b/src/fe-common/core/chat-completion.h @@ -1,5 +1,5 @@ -#ifndef __CHAT_COMPLETION_H -#define __CHAT_COMPLETION_H +#ifndef IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H +#define IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H GList *completion_get_chatnets(const char *word); GList *completion_get_servers(const char *word); diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h index 3b9de941..04922d2d 100644 --- a/src/fe-common/core/command-history.h +++ b/src/fe-common/core/command-history.h @@ -1,5 +1,5 @@ -#ifndef __COMMAND_HISTORY_H -#define __COMMAND_HISTORY_H +#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H +#define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H #include diff --git a/src/fe-common/core/completion.h b/src/fe-common/core/completion.h index dce3a2f1..d505aa84 100644 --- a/src/fe-common/core/completion.h +++ b/src/fe-common/core/completion.h @@ -1,5 +1,5 @@ -#ifndef __COMPLETION_H -#define __COMPLETION_H +#ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H +#define IRSSI_FE_COMMON_CORE_COMPLETION_H #include diff --git a/src/fe-common/core/fe-capsicum.h b/src/fe-common/core/fe-capsicum.h index a7cb743b..c0471296 100644 --- a/src/fe-common/core/fe-capsicum.h +++ b/src/fe-common/core/fe-capsicum.h @@ -1,5 +1,5 @@ -#ifndef __FE_CAPSICUM_H -#define __FE_CAPSICUM_H +#ifndef IRSSI_FE_COMMON_CORE_FE_CAPSICUM_H +#define IRSSI_FE_COMMON_CORE_FE_CAPSICUM_H void fe_capsicum_init(void); void fe_capsicum_deinit(void); diff --git a/src/fe-common/core/fe-channels.h b/src/fe-common/core/fe-channels.h index e9a03a12..34b24ac6 100644 --- a/src/fe-common/core/fe-channels.h +++ b/src/fe-common/core/fe-channels.h @@ -1,5 +1,5 @@ -#ifndef __FE_CHANNELS_H -#define __FE_CHANNELS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_CHANNELS_H +#define IRSSI_FE_COMMON_CORE_FE_CHANNELS_H #define CHANNEL_NICKLIST_FLAG_OPS 0x01 #define CHANNEL_NICKLIST_FLAG_HALFOPS 0x02 diff --git a/src/fe-common/core/fe-common-core.h b/src/fe-common/core/fe-common-core.h index 88b2e94b..a9a74b0f 100644 --- a/src/fe-common/core/fe-common-core.h +++ b/src/fe-common/core/fe-common-core.h @@ -1,5 +1,5 @@ -#ifndef __FE_COMMON_CORE_H -#define __FE_COMMON_CORE_H +#ifndef IRSSI_FE_COMMON_CORE_FE_COMMON_CORE_H +#define IRSSI_FE_COMMON_CORE_FE_COMMON_CORE_H void fe_common_core_register_options(void); void fe_common_core_init(void); diff --git a/src/fe-common/core/fe-core-commands.h b/src/fe-common/core/fe-core-commands.h index 261303de..d711b5d6 100644 --- a/src/fe-common/core/fe-core-commands.h +++ b/src/fe-common/core/fe-core-commands.h @@ -1,5 +1,5 @@ -#ifndef __FE_CORE_COMMANDS_H -#define __FE_CORE_COMMANDS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_CORE_COMMANDS_H +#define IRSSI_FE_COMMON_CORE_FE_CORE_COMMANDS_H extern int command_hide_output; diff --git a/src/fe-common/core/fe-exec.h b/src/fe-common/core/fe-exec.h index 21b1e18b..824d3d8a 100644 --- a/src/fe-common/core/fe-exec.h +++ b/src/fe-common/core/fe-exec.h @@ -1,5 +1,5 @@ -#ifndef __FE_EXEC_H -#define __FE_EXEC_H +#ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H +#define IRSSI_FE_COMMON_CORE_FE_EXEC_H #include diff --git a/src/fe-common/core/fe-messages.h b/src/fe-common/core/fe-messages.h index 07ecef80..03f7da7b 100644 --- a/src/fe-common/core/fe-messages.h +++ b/src/fe-common/core/fe-messages.h @@ -1,5 +1,5 @@ -#ifndef __FE_MESSAGES_H -#define __FE_MESSAGES_H +#ifndef IRSSI_FE_COMMON_CORE_FE_MESSAGES_H +#define IRSSI_FE_COMMON_CORE_FE_MESSAGES_H /* convert _underlined_ and *bold* words (and phrases) to use real underlining or bolding */ diff --git a/src/fe-common/core/fe-queries.h b/src/fe-common/core/fe-queries.h index 1dc7e81a..30c45e4e 100644 --- a/src/fe-common/core/fe-queries.h +++ b/src/fe-common/core/fe-queries.h @@ -1,5 +1,5 @@ -#ifndef __FE_QUERIES_H -#define __FE_QUERIES_H +#ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H +#define IRSSI_FE_COMMON_CORE_FE_QUERIES_H #include diff --git a/src/fe-common/core/fe-recode.h b/src/fe-common/core/fe-recode.h index 9fc73289..50775f2c 100644 --- a/src/fe-common/core/fe-recode.h +++ b/src/fe-common/core/fe-recode.h @@ -1,7 +1,7 @@ -#ifndef __FE_RECODE_H -#define __FE_RECODE_H +#ifndef IRSSI_FE_COMMON_CORE_FE_RECODE_H +#define IRSSI_FE_COMMON_CORE_FE_RECODE_H void fe_recode_init (void); void fe_recode_deinit (void); -#endif /* __FE_RECODE_H */ +#endif /* IRSSI_FE_COMMON_CORE_FE_RECODE_H */ diff --git a/src/fe-common/core/fe-settings.h b/src/fe-common/core/fe-settings.h index cc628790..61797bcd 100644 --- a/src/fe-common/core/fe-settings.h +++ b/src/fe-common/core/fe-settings.h @@ -1,5 +1,5 @@ -#ifndef __FE_SETTINGS_H -#define __FE_SETTINGS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_SETTINGS_H +#define IRSSI_FE_COMMON_CORE_FE_SETTINGS_H void fe_settings_set_print(const char *key); diff --git a/src/fe-common/core/fe-tls.h b/src/fe-common/core/fe-tls.h index f0082477..b0a3ea99 100644 --- a/src/fe-common/core/fe-tls.h +++ b/src/fe-common/core/fe-tls.h @@ -16,8 +16,8 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA */ -#ifndef __FE_TLS_H -#define __FE_TLS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_TLS_H +#define IRSSI_FE_COMMON_CORE_FE_TLS_H void fe_tls_init(void); void fe_tls_deinit(void); diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h index 782b5430..d5c60c81 100644 --- a/src/fe-common/core/fe-windows.h +++ b/src/fe-common/core/fe-windows.h @@ -1,5 +1,5 @@ -#ifndef __WINDOWS_H -#define __WINDOWS_H +#ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H +#define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H #include #include diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h index a52a3bbd..2e6133be 100644 --- a/src/fe-common/core/formats.h +++ b/src/fe-common/core/formats.h @@ -1,5 +1,5 @@ -#ifndef __FORMATS_H -#define __FORMATS_H +#ifndef IRSSI_FE_COMMON_CORE_FORMATS_H +#define IRSSI_FE_COMMON_CORE_FORMATS_H #include #include diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h index 1ffce6b9..0dfe78f3 100644 --- a/src/fe-common/core/hilight-text.h +++ b/src/fe-common/core/hilight-text.h @@ -1,5 +1,5 @@ -#ifndef __HILIGHT_TEXT_H -#define __HILIGHT_TEXT_H +#ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H +#define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H #include #include diff --git a/src/fe-common/core/keyboard.h b/src/fe-common/core/keyboard.h index 06b11bba..b19536a0 100644 --- a/src/fe-common/core/keyboard.h +++ b/src/fe-common/core/keyboard.h @@ -1,5 +1,5 @@ -#ifndef __KEYBOARD_H -#define __KEYBOARD_H +#ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H +#define IRSSI_FE_COMMON_CORE_KEYBOARD_H #include diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h index ff52b374..845bfc6c 100644 --- a/src/fe-common/core/printtext.h +++ b/src/fe-common/core/printtext.h @@ -1,5 +1,5 @@ -#ifndef __PRINTTEXT_H -#define __PRINTTEXT_H +#ifndef IRSSI_FE_COMMON_CORE_PRINTTEXT_H +#define IRSSI_FE_COMMON_CORE_PRINTTEXT_H #include #include diff --git a/src/fe-common/core/themes.h b/src/fe-common/core/themes.h index 31cfe943..53426f3b 100644 --- a/src/fe-common/core/themes.h +++ b/src/fe-common/core/themes.h @@ -1,5 +1,5 @@ -#ifndef __THEMES_H -#define __THEMES_H +#ifndef IRSSI_FE_COMMON_CORE_THEMES_H +#define IRSSI_FE_COMMON_CORE_THEMES_H typedef struct { char *name; diff --git a/src/fe-common/core/window-activity.h b/src/fe-common/core/window-activity.h index b904872f..42a4cda5 100644 --- a/src/fe-common/core/window-activity.h +++ b/src/fe-common/core/window-activity.h @@ -1,5 +1,5 @@ -#ifndef __WINDOW_ACTIVITY_H -#define __WINDOW_ACTIVITY_H +#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ACTIVITY_H +#define IRSSI_FE_COMMON_CORE_WINDOW_ACTIVITY_H void window_activity(WINDOW_REC *window, int data_level, const char *hilight_color); diff --git a/src/fe-common/core/window-items.h b/src/fe-common/core/window-items.h index 77ffe680..5bfa92fa 100644 --- a/src/fe-common/core/window-items.h +++ b/src/fe-common/core/window-items.h @@ -1,5 +1,5 @@ -#ifndef __WINDOW_ITEMS_H -#define __WINDOW_ITEMS_H +#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H +#define IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H #include diff --git a/src/fe-common/core/windows-layout.h b/src/fe-common/core/windows-layout.h index d33fda52..706fb781 100644 --- a/src/fe-common/core/windows-layout.h +++ b/src/fe-common/core/windows-layout.h @@ -1,5 +1,5 @@ -#ifndef __WINDOWS_LAYOUT_H -#define __WINDOWS_LAYOUT_H +#ifndef IRSSI_FE_COMMON_CORE_WINDOWS_LAYOUT_H +#define IRSSI_FE_COMMON_CORE_WINDOWS_LAYOUT_H void windows_layout_restore(void); void windows_layout_save(void); diff --git a/src/fe-common/irc/dcc/fe-dcc.h b/src/fe-common/irc/dcc/fe-dcc.h index f18b4a80..4d792966 100644 --- a/src/fe-common/irc/dcc/fe-dcc.h +++ b/src/fe-common/irc/dcc/fe-dcc.h @@ -1,5 +1,5 @@ -#ifndef __FE_DCC_H -#define __FE_DCC_H +#ifndef IRSSI_FE_COMMON_IRC_DCC_FE_DCC_H +#define IRSSI_FE_COMMON_IRC_DCC_FE_DCC_H char *dcc_get_size_str(uoff_t size); void dcc_list_print_file(FILE_DCC_REC *dcc); diff --git a/src/fe-common/irc/fe-irc-channels.h b/src/fe-common/irc/fe-irc-channels.h index d05c91a5..a5770107 100644 --- a/src/fe-common/irc/fe-irc-channels.h +++ b/src/fe-common/irc/fe-irc-channels.h @@ -1,5 +1,5 @@ -#ifndef __FE_IRC_CHANNELS_H -#define __FE_IRC_CHANNELS_H +#ifndef IRSSI_FE_COMMON_IRC_FE_IRC_CHANNELS_H +#define IRSSI_FE_COMMON_IRC_FE_IRC_CHANNELS_H int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target); const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target); diff --git a/src/fe-common/irc/fe-irc-server.h b/src/fe-common/irc/fe-irc-server.h index 7d9425be..28a709e3 100644 --- a/src/fe-common/irc/fe-irc-server.h +++ b/src/fe-common/irc/fe-irc-server.h @@ -1,5 +1,5 @@ -#ifndef __FE_IRC_SERVER_H -#define __FE_IRC_SERVER_H +#ifndef IRSSI_FE_COMMON_IRC_FE_IRC_SERVER_H +#define IRSSI_FE_COMMON_IRC_FE_IRC_SERVER_H const char *get_visible_target(IRC_SERVER_REC *server, const char *target); diff --git a/src/fe-text/gui-entry.h b/src/fe-text/gui-entry.h index dff860d3..97dcee22 100644 --- a/src/fe-text/gui-entry.h +++ b/src/fe-text/gui-entry.h @@ -1,5 +1,5 @@ -#ifndef __GUI_ENTRY_H -#define __GUI_ENTRY_H +#ifndef IRSSI_FE_TEXT_GUI_ENTRY_H +#define IRSSI_FE_TEXT_GUI_ENTRY_H typedef struct { int cutbuffer_len; diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h index 90f82220..ba5d6f8f 100644 --- a/src/fe-text/gui-printtext.h +++ b/src/fe-text/gui-printtext.h @@ -1,5 +1,5 @@ -#ifndef __GUI_PRINTTEXT_H -#define __GUI_PRINTTEXT_H +#ifndef IRSSI_FE_TEXT_GUI_PRINTTEXT_H +#define IRSSI_FE_TEXT_GUI_PRINTTEXT_H #include #include diff --git a/src/fe-text/gui-readline.h b/src/fe-text/gui-readline.h index 9ce3a742..dc497b8f 100644 --- a/src/fe-text/gui-readline.h +++ b/src/fe-text/gui-readline.h @@ -1,5 +1,5 @@ -#ifndef __GUI_READLINE_H -#define __GUI_READLINE_H +#ifndef IRSSI_FE_TEXT_GUI_READLINE_H +#define IRSSI_FE_TEXT_GUI_READLINE_H extern char *cutbuffer; diff --git a/src/fe-text/gui-windows.h b/src/fe-text/gui-windows.h index 9fc3fbd5..52a64cea 100644 --- a/src/fe-text/gui-windows.h +++ b/src/fe-text/gui-windows.h @@ -1,5 +1,5 @@ -#ifndef __GUI_WINDOWS_H -#define __GUI_WINDOWS_H +#ifndef IRSSI_FE_TEXT_GUI_WINDOWS_H +#define IRSSI_FE_TEXT_GUI_WINDOWS_H #include #include diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h index 3a7fb1ed..52cf2df3 100644 --- a/src/fe-text/mainwindows.h +++ b/src/fe-text/mainwindows.h @@ -1,5 +1,5 @@ -#ifndef __MAINWINDOWS_H -#define __MAINWINDOWS_H +#ifndef IRSSI_FE_TEXT_MAINWINDOWS_H +#define IRSSI_FE_TEXT_MAINWINDOWS_H #include #include diff --git a/src/fe-text/statusbar-config.h b/src/fe-text/statusbar-config.h index ebba7da1..239918db 100644 --- a/src/fe-text/statusbar-config.h +++ b/src/fe-text/statusbar-config.h @@ -1,5 +1,5 @@ -#ifndef __STATUSBAR_CONFIG_H -#define __STATUSBAR_CONFIG_H +#ifndef IRSSI_FE_TEXT_STATUSBAR_CONFIG_H +#define IRSSI_FE_TEXT_STATUSBAR_CONFIG_H #include diff --git a/src/fe-text/statusbar.h b/src/fe-text/statusbar.h index eae29900..140d355d 100644 --- a/src/fe-text/statusbar.h +++ b/src/fe-text/statusbar.h @@ -1,5 +1,5 @@ -#ifndef __STATUSBAR_H -#define __STATUSBAR_H +#ifndef IRSSI_FE_TEXT_STATUSBAR_H +#define IRSSI_FE_TEXT_STATUSBAR_H #include #include diff --git a/src/fe-text/term.h b/src/fe-text/term.h index af866bea..7758fea3 100644 --- a/src/fe-text/term.h +++ b/src/fe-text/term.h @@ -1,5 +1,5 @@ -#ifndef __TERM_H -#define __TERM_H +#ifndef IRSSI_FE_TEXT_TERM_H +#define IRSSI_FE_TEXT_TERM_H typedef struct _TERM_WINDOW TERM_WINDOW; diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h index 1253fd9d..a077d0bf 100644 --- a/src/fe-text/terminfo-core.h +++ b/src/fe-text/terminfo-core.h @@ -1,5 +1,5 @@ -#ifndef __TERMINFO_CORE_H -#define __TERMINFO_CORE_H +#ifndef IRSSI_FE_TEXT_TERMINFO_CORE_H +#define IRSSI_FE_TEXT_TERMINFO_CORE_H #include diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h index 54775783..607016ac 100644 --- a/src/fe-text/textbuffer-view.h +++ b/src/fe-text/textbuffer-view.h @@ -1,5 +1,5 @@ -#ifndef __TEXTBUFFER_VIEW_H -#define __TEXTBUFFER_VIEW_H +#ifndef IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H +#define IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H #include #include diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h index 2aa22f1a..cbe4fbf0 100644 --- a/src/fe-text/textbuffer.h +++ b/src/fe-text/textbuffer.h @@ -1,5 +1,5 @@ -#ifndef __TEXTBUFFER_H -#define __TEXTBUFFER_H +#ifndef IRSSI_FE_TEXT_TEXTBUFFER_H +#define IRSSI_FE_TEXT_TEXTBUFFER_H /* Make sure TEXT_CHUNK_REC is not slightly more than a page, as that wastes a lot of memory. */ diff --git a/src/irc/core/bans.h b/src/irc/core/bans.h index 0b00f19d..5f052667 100644 --- a/src/irc/core/bans.h +++ b/src/irc/core/bans.h @@ -1,5 +1,5 @@ -#ifndef __BANS_H -#define __BANS_H +#ifndef IRSSI_IRC_CORE_BANS_H +#define IRSSI_IRC_CORE_BANS_H void bans_init(void); void bans_deinit(void); diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h index d13c9760..ada3e3a1 100644 --- a/src/irc/core/channel-events.h +++ b/src/irc/core/channel-events.h @@ -1,5 +1,5 @@ -#ifndef __CHANNEL_EVENTS_H -#define __CHANNEL_EVENTS_H +#ifndef IRSSI_IRC_CORE_CHANNEL_EVENTS_H +#define IRSSI_IRC_CORE_CHANNEL_EVENTS_H #include diff --git a/src/irc/core/channel-rejoin.h b/src/irc/core/channel-rejoin.h index 0b9cd151..3c465799 100644 --- a/src/irc/core/channel-rejoin.h +++ b/src/irc/core/channel-rejoin.h @@ -1,5 +1,5 @@ -#ifndef __CHANNEL_REJOIN_H -#define __CHANNEL_REJOIN_H +#ifndef IRSSI_IRC_CORE_CHANNEL_REJOIN_H +#define IRSSI_IRC_CORE_CHANNEL_REJOIN_H typedef struct { char *channel; diff --git a/src/irc/core/ctcp.h b/src/irc/core/ctcp.h index a146b15f..c8a8a84e 100644 --- a/src/irc/core/ctcp.h +++ b/src/irc/core/ctcp.h @@ -1,5 +1,5 @@ -#ifndef __CTCP_H -#define __CTCP_H +#ifndef IRSSI_IRC_CORE_CTCP_H +#define IRSSI_IRC_CORE_CTCP_H /* Register/unregister CTCP command, so it shows in CTCP CLIENTINFO */ void ctcp_register(const char *name); diff --git a/src/irc/core/irc-cap.h b/src/irc/core/irc-cap.h index 96efbbee..aa13023a 100644 --- a/src/irc/core/irc-cap.h +++ b/src/irc/core/irc-cap.h @@ -1,5 +1,5 @@ -#ifndef __IRC_CAP_H -#define __IRC_CAP_H +#ifndef IRSSI_IRC_CORE_IRC_CAP_H +#define IRSSI_IRC_CORE_IRC_CAP_H void irc_cap_init(void); void irc_cap_deinit(void); diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h index 2262b484..4ed7fd73 100644 --- a/src/irc/core/irc-channels.h +++ b/src/irc/core/irc-channels.h @@ -1,5 +1,5 @@ -#ifndef __IRC_CHANNELS_H -#define __IRC_CHANNELS_H +#ifndef IRSSI_IRC_CORE_IRC_CHANNELS_H +#define IRSSI_IRC_CORE_IRC_CHANNELS_H #include #include diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h index 00aea848..10e98921 100644 --- a/src/irc/core/irc-chatnets.h +++ b/src/irc/core/irc-chatnets.h @@ -1,5 +1,5 @@ -#ifndef __IRC_CHATNETS_H -#define __IRC_CHATNETS_H +#ifndef IRSSI_IRC_CORE_IRC_CHATNETS_H +#define IRSSI_IRC_CORE_IRC_CHATNETS_H #include #include diff --git a/src/irc/core/irc-commands.h b/src/irc/core/irc-commands.h index 3e24c5a8..6f689313 100644 --- a/src/irc/core/irc-commands.h +++ b/src/irc/core/irc-commands.h @@ -1,5 +1,5 @@ -#ifndef __IRC_COMMANDS_H -#define __IRC_COMMANDS_H +#ifndef IRSSI_IRC_CORE_IRC_COMMANDS_H +#define IRSSI_IRC_CORE_IRC_COMMANDS_H #include diff --git a/src/irc/core/irc-masks.h b/src/irc/core/irc-masks.h index e152c52a..5696bbb5 100644 --- a/src/irc/core/irc-masks.h +++ b/src/irc/core/irc-masks.h @@ -1,5 +1,5 @@ -#ifndef __IRC_MASKS_H -#define __IRC_MASKS_H +#ifndef IRSSI_IRC_CORE_IRC_MASKS_H +#define IRSSI_IRC_CORE_IRC_MASKS_H #include diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h index e9b30f30..7ac3176d 100644 --- a/src/irc/core/irc-nicklist.h +++ b/src/irc/core/irc-nicklist.h @@ -1,5 +1,5 @@ -#ifndef __IRC_NICKLIST_H -#define __IRC_NICKLIST_H +#ifndef IRSSI_IRC_CORE_IRC_NICKLIST_H +#define IRSSI_IRC_CORE_IRC_NICKLIST_H #include diff --git a/src/irc/core/irc-queries.h b/src/irc/core/irc-queries.h index 323006ad..f6680ed2 100644 --- a/src/irc/core/irc-queries.h +++ b/src/irc/core/irc-queries.h @@ -1,5 +1,5 @@ -#ifndef __IRC_QUERIES_H -#define __IRC_QUERIES_H +#ifndef IRSSI_IRC_CORE_IRC_QUERIES_H +#define IRSSI_IRC_CORE_IRC_QUERIES_H #include #include diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h index ac2ca2fc..d3bafdef 100644 --- a/src/irc/core/irc-servers-setup.h +++ b/src/irc/core/irc-servers-setup.h @@ -1,5 +1,5 @@ -#ifndef __IRC_SERVERS_SETUP_H -#define __IRC_SERVERS_SETUP_H +#ifndef IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H +#define IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H #include #include diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h index c798a03b..57b65527 100644 --- a/src/irc/core/irc-servers.h +++ b/src/irc/core/irc-servers.h @@ -1,5 +1,5 @@ -#ifndef __IRC_SERVERS_H -#define __IRC_SERVERS_H +#ifndef IRSSI_IRC_CORE_IRC_SERVERS_H +#define IRSSI_IRC_CORE_IRC_SERVERS_H #include #include diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h index d018b90c..3f1a9887 100644 --- a/src/irc/core/irc.h +++ b/src/irc/core/irc.h @@ -1,5 +1,5 @@ -#ifndef __IRC_H -#define __IRC_H +#ifndef IRSSI_IRC_CORE_IRC_H +#define IRSSI_IRC_CORE_IRC_H typedef struct _IRC_CHATNET_REC IRC_CHATNET_REC; typedef struct _IRC_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC; diff --git a/src/irc/core/mode-lists.h b/src/irc/core/mode-lists.h index cd3bc0bf..2c9f20b1 100644 --- a/src/irc/core/mode-lists.h +++ b/src/irc/core/mode-lists.h @@ -1,5 +1,5 @@ -#ifndef __MODE_LISTS_H -#define __MODE_LISTS_H +#ifndef IRSSI_IRC_CORE_MODE_LISTS_H +#define IRSSI_IRC_CORE_MODE_LISTS_H typedef struct { char *ban; diff --git a/src/irc/core/modes.h b/src/irc/core/modes.h index 9442dd5e..f899a06d 100644 --- a/src/irc/core/modes.h +++ b/src/irc/core/modes.h @@ -1,5 +1,5 @@ -#ifndef __MODES_H -#define __MODES_H +#ifndef IRSSI_IRC_CORE_MODES_H +#define IRSSI_IRC_CORE_MODES_H #include #include /* MAX_USER_PREFIXES */ diff --git a/src/irc/core/netsplit.h b/src/irc/core/netsplit.h index 7cdee694..50edf63b 100644 --- a/src/irc/core/netsplit.h +++ b/src/irc/core/netsplit.h @@ -1,5 +1,5 @@ -#ifndef __NETSPLIT_H -#define __NETSPLIT_H +#ifndef IRSSI_IRC_CORE_NETSPLIT_H +#define IRSSI_IRC_CORE_NETSPLIT_H #include diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h index 0693989d..04d0cd9d 100644 --- a/src/irc/core/sasl.h +++ b/src/irc/core/sasl.h @@ -18,8 +18,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __SASL_H -#define __SASL_H +#ifndef IRSSI_IRC_CORE_SASL_H +#define IRSSI_IRC_CORE_SASL_H enum { SASL_MECHANISM_NONE = 0, diff --git a/src/irc/core/servers-idle.h b/src/irc/core/servers-idle.h index 9d2eacec..b0aed721 100644 --- a/src/irc/core/servers-idle.h +++ b/src/irc/core/servers-idle.h @@ -1,5 +1,5 @@ -#ifndef __SERVERS_IDLE_H -#define __SERVERS_IDLE_H +#ifndef IRSSI_IRC_CORE_SERVERS_IDLE_H +#define IRSSI_IRC_CORE_SERVERS_IDLE_H /* Add new idle command to queue */ int server_idle_add_redir(IRC_SERVER_REC *server, const char *cmd, diff --git a/src/irc/core/servers-redirect.h b/src/irc/core/servers-redirect.h index 6182e3ab..f8ca605f 100644 --- a/src/irc/core/servers-redirect.h +++ b/src/irc/core/servers-redirect.h @@ -1,5 +1,5 @@ -#ifndef __SERVERS_REDIRECT_H -#define __SERVERS_REDIRECT_H +#ifndef IRSSI_IRC_CORE_SERVERS_REDIRECT_H +#define IRSSI_IRC_CORE_SERVERS_REDIRECT_H /* Register new redirection command. diff --git a/src/irc/dcc/dcc-chat.h b/src/irc/dcc/dcc-chat.h index a22fe75d..ef992bb8 100644 --- a/src/irc/dcc/dcc-chat.h +++ b/src/irc/dcc/dcc-chat.h @@ -1,5 +1,5 @@ -#ifndef __DCC_CHAT_H -#define __DCC_CHAT_H +#ifndef IRSSI_IRC_DCC_DCC_CHAT_H +#define IRSSI_IRC_DCC_DCC_CHAT_H #include diff --git a/src/irc/dcc/dcc-file.h b/src/irc/dcc/dcc-file.h index ef32f07c..38986354 100644 --- a/src/irc/dcc/dcc-file.h +++ b/src/irc/dcc/dcc-file.h @@ -1,5 +1,5 @@ -#ifndef __DCC_FILE_H -#define __DCC_FILE_H +#ifndef IRSSI_IRC_DCC_DCC_FILE_H +#define IRSSI_IRC_DCC_DCC_FILE_H #include diff --git a/src/irc/dcc/dcc-get.h b/src/irc/dcc/dcc-get.h index b6ee385c..3624f2c8 100644 --- a/src/irc/dcc/dcc-get.h +++ b/src/irc/dcc/dcc-get.h @@ -1,5 +1,5 @@ -#ifndef __DCC_GET_H -#define __DCC_GET_H +#ifndef IRSSI_IRC_DCC_DCC_GET_H +#define IRSSI_IRC_DCC_DCC_GET_H #include diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h index 8c1a9b46..1ab4ecbf 100644 --- a/src/irc/dcc/dcc-queue.h +++ b/src/irc/dcc/dcc-queue.h @@ -1,5 +1,5 @@ -#ifndef __DCC_QUEUE_H_ -#define __DCC_QUEUE_H_ +#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H_ +#define IRSSI_IRC_DCC_DCC_QUEUE_H_ #include diff --git a/src/irc/dcc/dcc-send.h b/src/irc/dcc/dcc-send.h index a0ee1ade..881ef64e 100644 --- a/src/irc/dcc/dcc-send.h +++ b/src/irc/dcc/dcc-send.h @@ -1,5 +1,5 @@ -#ifndef __DCC_SEND_H -#define __DCC_SEND_H +#ifndef IRSSI_IRC_DCC_DCC_SEND_H +#define IRSSI_IRC_DCC_DCC_SEND_H #include diff --git a/src/irc/dcc/dcc-server.h b/src/irc/dcc/dcc-server.h index a1973b5f..1a4449d4 100644 --- a/src/irc/dcc/dcc-server.h +++ b/src/irc/dcc/dcc-server.h @@ -1,5 +1,5 @@ -#ifndef __DCC_SERVER_H -#define __DCC_SERVER_H +#ifndef IRSSI_IRC_DCC_DCC_SERVER_H +#define IRSSI_IRC_DCC_DCC_SERVER_H #include diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h index 5f54ee18..258d3395 100644 --- a/src/irc/dcc/dcc.h +++ b/src/irc/dcc/dcc.h @@ -1,5 +1,5 @@ -#ifndef __DCC_H -#define __DCC_H +#ifndef IRSSI_IRC_DCC_DCC_H +#define IRSSI_IRC_DCC_DCC_H #include #include diff --git a/src/irc/flood/autoignore.h b/src/irc/flood/autoignore.h index b00829a1..6c7a86e8 100644 --- a/src/irc/flood/autoignore.h +++ b/src/irc/flood/autoignore.h @@ -1,5 +1,5 @@ -#ifndef __AUTOIGNORE_H -#define __AUTOIGNORE_H +#ifndef IRSSI_IRC_FLOOD_AUTOIGNORE_H +#define IRSSI_IRC_FLOOD_AUTOIGNORE_H void autoignore_add(IRC_SERVER_REC *server, char *nick, int level); diff --git a/src/irc/flood/flood.h b/src/irc/flood/flood.h index e6454729..6bfc7850 100644 --- a/src/irc/flood/flood.h +++ b/src/irc/flood/flood.h @@ -1,5 +1,5 @@ -#ifndef __FLOOD_H -#define __FLOOD_H +#ifndef IRSSI_IRC_FLOOD_FLOOD_H +#define IRSSI_IRC_FLOOD_FLOOD_H void flood_init(void); void flood_deinit(void); diff --git a/src/irc/notifylist/notify-setup.h b/src/irc/notifylist/notify-setup.h index bfaef0c8..8540d1c2 100644 --- a/src/irc/notifylist/notify-setup.h +++ b/src/irc/notifylist/notify-setup.h @@ -1,5 +1,5 @@ -#ifndef __NOTIFY_SETUP_H -#define __NOTIFY_SETUP_H +#ifndef IRSSI_IRC_NOTIFYLIST_NOTIFY_SETUP_H +#define IRSSI_IRC_NOTIFYLIST_NOTIFY_SETUP_H void notifylist_add_config(NOTIFYLIST_REC *rec); void notifylist_remove_config(NOTIFYLIST_REC *rec); diff --git a/src/irc/notifylist/notifylist.h b/src/irc/notifylist/notifylist.h index 1094a105..fe2a1aac 100644 --- a/src/irc/notifylist/notifylist.h +++ b/src/irc/notifylist/notifylist.h @@ -1,5 +1,5 @@ -#ifndef __NOTIFYLIST_H -#define __NOTIFYLIST_H +#ifndef IRSSI_IRC_NOTIFYLIST_NOTIFYLIST_H +#define IRSSI_IRC_NOTIFYLIST_NOTIFYLIST_H typedef struct { char *mask; /* nick part must not contain wildcards */ diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h index 2cbaf69d..5b3d25f5 100644 --- a/src/irc/proxy/proxy.h +++ b/src/irc/proxy/proxy.h @@ -1,5 +1,5 @@ -#ifndef PROXY_H -#define PROXY_H +#ifndef IRSSI_IRC_PROXY_PROXY_H +#define IRSSI_IRC_PROXY_PROXY_H #include diff --git a/src/lib-config/iconfig.h b/src/lib-config/iconfig.h index 91583e40..92662d8d 100644 --- a/src/lib-config/iconfig.h +++ b/src/lib-config/iconfig.h @@ -1,5 +1,5 @@ -#ifndef __ICONFIG_H -#define __ICONFIG_H +#ifndef IRSSI_LIB_CONFIG_ICONFIG_H +#define IRSSI_LIB_CONFIG_ICONFIG_H enum { NODE_TYPE_KEY, diff --git a/src/perl/perl-common.h b/src/perl/perl-common.h index e2992ee9..88adaa7e 100644 --- a/src/perl/perl-common.h +++ b/src/perl/perl-common.h @@ -1,5 +1,5 @@ -#ifndef __PERL_COMMON_H -#define __PERL_COMMON_H +#ifndef IRSSI_PERL_PERL_COMMON_H +#define IRSSI_PERL_PERL_COMMON_H /* helper defines */ #define new_pv(a) \ diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h index 7390a6fd..0d3a1a2f 100644 --- a/src/perl/perl-core.h +++ b/src/perl/perl-core.h @@ -1,5 +1,5 @@ -#ifndef __PERL_CORE_H -#define __PERL_CORE_H +#ifndef IRSSI_PERL_PERL_CORE_H +#define IRSSI_PERL_PERL_CORE_H typedef struct { char *name; /* unique name */ diff --git a/src/perl/perl-signals.h b/src/perl/perl-signals.h index 78a95bed..8191a917 100644 --- a/src/perl/perl-signals.h +++ b/src/perl/perl-signals.h @@ -1,5 +1,5 @@ -#ifndef __PERL_SIGNALS_H -#define __PERL_SIGNALS_H +#ifndef IRSSI_PERL_PERL_SIGNALS_H +#define IRSSI_PERL_PERL_SIGNALS_H void perl_signal_args_to_c(void (*callback)(void *, void **), void *cb_arg, int signal_id, SV **args, size_t n_args); diff --git a/src/perl/perl-sources.h b/src/perl/perl-sources.h index a83a65a6..0addb35d 100644 --- a/src/perl/perl-sources.h +++ b/src/perl/perl-sources.h @@ -1,5 +1,5 @@ -#ifndef __PERL_SOURCES_H -#define __PERL_SOURCES_H +#ifndef IRSSI_PERL_PERL_SOURCES_H +#define IRSSI_PERL_PERL_SOURCES_H int perl_timeout_add(int msecs, SV *func, SV *data, int once); int perl_input_add(int source, int condition, SV *func, SV *data, int once);