core: remove value for first #define in headers, add "PLUGIN" in plugin headers

2026-07-03 00:03:12 +02:00 · 2017-08-10 20:05:16 +02:00
parent c58716809c
commit 9bad3f44db
176 changed files with 430 additions and 430 deletions
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ALIAS_COMMAND_H
-#define WEECHAT_ALIAS_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_ALIAS_COMMAND_H
+#define WEECHAT_PLUGIN_ALIAS_COMMAND_H

 extern void alias_command_init ();

-#endif /* WEECHAT_ALIAS_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_ALIAS_COMMAND_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ALIAS_COMPLETION_H
-#define WEECHAT_ALIAS_COMPLETION_H 1
+#ifndef WEECHAT_PLUGIN_ALIAS_COMPLETION_H
+#define WEECHAT_PLUGIN_ALIAS_COMPLETION_H

 extern void alias_completion_init ();

-#endif /* WEECHAT_ALIAS_COMPLETION_H */
+#endif /* WEECHAT_PLUGIN_ALIAS_COMPLETION_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ALIAS_CONFIG_H
-#define WEECHAT_ALIAS_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_ALIAS_CONFIG_H
+#define WEECHAT_PLUGIN_ALIAS_CONFIG_H

 extern struct t_config_file *alias_config_file;
 extern struct t_config_section *alias_config_section_cmd;
@@ -32,4 +32,4 @@ extern int alias_config_init ();
 extern int alias_config_read ();
 extern int alias_config_write ();

-#endif /* WEECHAT_ALIAS_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_ALIAS_CONFIG_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ALIAS_INFO_H
-#define WEECHAT_ALIAS_INFO_H 1
+#ifndef WEECHAT_PLUGIN_ALIAS_INFO_H
+#define WEECHAT_PLUGIN_ALIAS_INFO_H

 extern void alias_info_init ();

-#endif /* WEECHAT_ALIAS_INFO_H */
+#endif /* WEECHAT_PLUGIN_ALIAS_INFO_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ALIAS_H
-#define WEECHAT_ALIAS_H 1
+#ifndef WEECHAT_PLUGIN_ALIAS_H
+#define WEECHAT_PLUGIN_ALIAS_H

 #define weechat_plugin weechat_alias_plugin
 #define ALIAS_PLUGIN_NAME "alias"
@@ -52,4 +52,4 @@ extern void alias_free_all ();
 extern int alias_add_to_infolist (struct t_infolist *infolist,
                                  struct t_alias *alias);

-#endif /* WEECHAT_ALIAS_H */
+#endif /* WEECHAT_PLUGIN_ALIAS_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_BAR_ITEM_H
-#define WEECHAT_ASPELL_BAR_ITEM_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_BAR_ITEM_H
+#define WEECHAT_PLUGIN_ASPELL_BAR_ITEM_H

 extern void weechat_aspell_bar_item_init ();

-#endif /* WEECHAT_ASPELL_BAR_ITEM_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_BAR_ITEM_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_COMMAND_H
-#define WEECHAT_ASPELL_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_COMMAND_H
+#define WEECHAT_PLUGIN_ASPELL_COMMAND_H

 extern void weechat_aspell_command_init ();

-#endif /* WEECHAT_ASPELL_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_COMMAND_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_COMPLETION_H
-#define WEECHAT_ASPELL_COMPLETION_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_COMPLETION_H
+#define WEECHAT_PLUGIN_ASPELL_COMPLETION_H

 extern void weechat_aspell_completion_init ();

-#endif /* WEECHAT_ASPELL_COMPLETION_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_COMPLETION_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_CONFIG_H
-#define WEECHAT_ASPELL_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_CONFIG_H
+#define WEECHAT_PLUGIN_ASPELL_CONFIG_H

 #define ASPELL_CONFIG_NAME "aspell"

@@ -51,4 +51,4 @@ extern int weechat_aspell_config_read ();
 extern int weechat_aspell_config_write ();
 extern void weechat_aspell_config_free ();

-#endif /* WEECHAT_ASPELL_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_CONFIG_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_INFO_H
-#define WEECHAT_ASPELL_INFO_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_INFO_H
+#define WEECHAT_PLUGIN_ASPELL_INFO_H

 extern void weechat_aspell_info_init ();

-#endif /* WEECHAT_ASPELL_INFO_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_INFO_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_SPELLER_H
-#define WEECHAT_ASPELL_SPELLER_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_SPELLER_H
+#define WEECHAT_PLUGIN_ASPELL_SPELLER_H

 struct t_aspell_speller_buffer
 {
@@ -48,4 +48,4 @@ extern struct t_aspell_speller_buffer *weechat_aspell_speller_buffer_new (struct
 extern int weechat_aspell_speller_init ();
 extern void weechat_aspell_speller_end ();

-#endif /* WEECHAT_ASPELL_SPELLER_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_SPELLER_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_ASPELL_H
-#define WEECHAT_ASPELL_H 1
+#ifndef WEECHAT_PLUGIN_ASPELL_H
+#define WEECHAT_PLUGIN_ASPELL_H

 #ifdef USE_ENCHANT
 #include <enchant.h>
@@ -49,4 +49,4 @@ extern char *weechat_aspell_build_option_name (struct t_gui_buffer *buffer);
 extern const char *weechat_aspell_get_dict_with_buffer_name (const char *name);
 extern const char *weechat_aspell_get_dict (struct t_gui_buffer *buffer);

-#endif /* WEECHAT_ASPELL_H */
+#endif /* WEECHAT_PLUGIN_ASPELL_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_BUFLIST_BAR_ITEM_H
-#define WEECHAT_BUFLIST_BAR_ITEM_H 1
+#ifndef WEECHAT_PLUGIN_BUFLIST_BAR_ITEM_H
+#define WEECHAT_PLUGIN_BUFLIST_BAR_ITEM_H

 #define BUFLIST_BAR_ITEM_NAME "buflist"

@@ -28,4 +28,4 @@ extern void buflist_bar_item_update ();
 extern int buflist_bar_item_init ();
 extern void buflist_bar_item_end ();

-#endif /* WEECHAT_BUFLIST_BAR_ITEM_H */
+#endif /* WEECHAT_PLUGIN_BUFLIST_BAR_ITEM_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_BUFLIST_COMMAND_H
-#define WEECHAT_BUFLIST_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_BUFLIST_COMMAND_H
+#define WEECHAT_PLUGIN_BUFLIST_COMMAND_H

 extern void buflist_command_init ();

-#endif /* WEECHAT_BUFLIST_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_BUFLIST_COMMAND_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_BUFLIST_CONFIG_H
-#define WEECHAT_BUFLIST_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_BUFLIST_CONFIG_H
+#define WEECHAT_PLUGIN_BUFLIST_CONFIG_H

 #define BUFLIST_CONFIG_NAME "buflist"

@@ -64,4 +64,4 @@ extern int buflist_config_read ();
 extern int buflist_config_write ();
 extern void buflist_config_free ();

-#endif /* WEECHAT_BUFLIST_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_BUFLIST_CONFIG_H */
@@ -17,12 +17,12 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_BUFLIST_MOUSE_H
-#define WEECHAT_BUFLIST_MOUSE_H 1
+#ifndef WEECHAT_PLUGIN_BUFLIST_MOUSE_H
+#define WEECHAT_PLUGIN_BUFLIST_MOUSE_H

 #define BUFLIST_MOUSE_HSIGNAL "buflist_mouse"

 extern int buflist_mouse_init ();
 extern void buflist_mouse_end ();

-#endif /* WEECHAT_BUFLIST_MOUSE_H */
+#endif /* WEECHAT_PLUGIN_BUFLIST_MOUSE_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_BUFLIST_H
-#define WEECHAT_BUFLIST_H 1
+#ifndef WEECHAT_PLUGIN_BUFLIST_H
+#define WEECHAT_PLUGIN_BUFLIST_H

 #define weechat_plugin weechat_buflist_plugin
 #define BUFLIST_PLUGIN_NAME "buflist"
@@ -38,4 +38,4 @@ extern void buflist_buffer_get_irc_pointers(struct t_gui_buffer *buffer,
                                            void **irc_server, void **irc_channel);
 extern struct t_arraylist *buflist_sort_buffers ();

-#endif /* WEECHAT_BUFLIST_H */
+#endif /* WEECHAT_PLUGIN_BUFLIST_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_EXEC_BUFFER_H
-#define WEECHAT_EXEC_BUFFER_H 1
+#ifndef WEECHAT_PLUGIN_EXEC_BUFFER_H
+#define WEECHAT_PLUGIN_EXEC_BUFFER_H

 extern void exec_buffer_set_callbacks ();
 extern struct t_gui_buffer *exec_buffer_new (const char *name,
@@ -26,4 +26,4 @@ extern struct t_gui_buffer *exec_buffer_new (const char *name,
                                             int clear_buffer,
                                             int switch_to_buffer);

-#endif /* WEECHAT_EXEC_BUFFER_H */
+#endif /* WEECHAT_PLUGIN_EXEC_BUFFER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_EXEC_COMMAND_H
-#define WEECHAT_EXEC_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_EXEC_COMMAND_H
+#define WEECHAT_PLUGIN_EXEC_COMMAND_H

 struct t_exec_cmd_options
 {
@@ -48,4 +48,4 @@ extern int exec_command_run (struct t_gui_buffer *buffer,
                             int start_arg);
 extern void exec_command_init ();

-#endif /* WEECHAT_EXEC_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_EXEC_COMMAND_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_EXEC_COMPLETION_H
-#define WEECHAT_EXEC_COMPLETION_H 1
+#ifndef WEECHAT_PLUGIN_EXEC_COMPLETION_H
+#define WEECHAT_PLUGIN_EXEC_COMPLETION_H

 extern void exec_completion_init ();

-#endif /* WEECHAT_EXEC_COMPLETION_H */
+#endif /* WEECHAT_PLUGIN_EXEC_COMPLETION_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_EXEC_CONFIG_H
-#define WEECHAT_EXEC_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_EXEC_CONFIG_H
+#define WEECHAT_PLUGIN_EXEC_CONFIG_H

 #define EXEC_CONFIG_NAME "exec"

@@ -38,4 +38,4 @@ extern int exec_config_read ();
 extern int exec_config_write ();
 extern void exec_config_free ();

-#endif /* WEECHAT_EXEC_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_EXEC_CONFIG_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_EXEC_H
-#define WEECHAT_EXEC_H 1
+#ifndef WEECHAT_PLUGIN_EXEC_H
+#define WEECHAT_PLUGIN_EXEC_H

 #include <unistd.h>
 #include <time.h>
@@ -88,4 +88,4 @@ extern int exec_process_cb (const void *pointer, void *data,
 extern void exec_free (struct t_exec_cmd *exec_cmd);
 extern void exec_free_all ();

-#endif /* WEECHAT_EXEC_H */
+#endif /* WEECHAT_PLUGIN_EXEC_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FIFO_COMMAND_H
-#define WEECHAT_FIFO_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_FIFO_COMMAND_H
+#define WEECHAT_PLUGIN_FIFO_COMMAND_H

 extern void fifo_command_init ();

-#endif /* WEECHAT_FIFO_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_FIFO_COMMAND_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FIFO_CONFIG_H
-#define WEECHAT_FIFO_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_FIFO_CONFIG_H
+#define WEECHAT_PLUGIN_FIFO_CONFIG_H

 #define FIFO_CONFIG_NAME "fifo"

@@ -31,4 +31,4 @@ extern int fifo_config_read ();
 extern int fifo_config_write ();
 extern void fifo_config_free ();

-#endif /* WEECHAT_FIFO_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_FIFO_CONFIG_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FIFO_INFO_H
-#define WEECHAT_FIFO_INFO_H 1
+#ifndef WEECHAT_PLUGIN_FIFO_INFO_H
+#define WEECHAT_PLUGIN_FIFO_INFO_H

 extern void fifo_info_init ();

-#endif /* WEECHAT_FIFO_INFO_H */
+#endif /* WEECHAT_PLUGIN_FIFO_INFO_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FIFO_H
-#define WEECHAT_FIFO_H 1
+#ifndef WEECHAT_PLUGIN_FIFO_H
+#define WEECHAT_PLUGIN_FIFO_H

 #define weechat_plugin weechat_fifo_plugin
 #define FIFO_PLUGIN_NAME "fifo"
@@ -31,4 +31,4 @@ extern char *fifo_filename;
 extern void fifo_create ();
 extern void fifo_remove ();

-#endif /* WEECHAT_FIFO_H */
+#endif /* WEECHAT_PLUGIN_FIFO_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_BAR_ITEM_H
-#define WEECHAT_FSET_BAR_ITEM_H 1
+#ifndef WEECHAT_PLUGIN_FSET_BAR_ITEM_H
+#define WEECHAT_PLUGIN_FSET_BAR_ITEM_H

 #define FSET_BAR_ITEM_NAME "fset"

@@ -26,4 +26,4 @@ extern void fset_bar_item_update ();
 extern int fset_bar_item_init ();
 extern void fset_bar_item_end ();

-#endif /* WEECHAT_FSET_BAR_ITEM_H */
+#endif /* WEECHAT_PLUGIN_FSET_BAR_ITEM_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_BUFFER_H
-#define WEECHAT_FSET_BUFFER_H 1
+#ifndef WEECHAT_PLUGIN_FSET_BUFFER_H
+#define WEECHAT_PLUGIN_FSET_BUFFER_H

 #define FSET_BUFFER_NAME "fset"

@@ -43,4 +43,4 @@ extern void fset_buffer_open ();
 extern int fset_buffer_init ();
 extern void fset_buffer_end ();

-#endif /* WEECHAT_FSET_BUFFER_H */
+#endif /* WEECHAT_PLUGIN_FSET_BUFFER_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_COMMAND_H
-#define WEECHAT_FSET_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_FSET_COMMAND_H
+#define WEECHAT_PLUGIN_FSET_COMMAND_H

 extern void fset_command_init ();

-#endif /* WEECHAT_FSET_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_FSET_COMMAND_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_COMPLETION_H
-#define WEECHAT_FSET_COMPLETION_H 1
+#ifndef WEECHAT_PLUGIN_FSET_COMPLETION_H
+#define WEECHAT_PLUGIN_FSET_COMPLETION_H

 extern void fset_completion_init ();

-#endif /* WEECHAT_FSET_COMPLETION_H */
+#endif /* WEECHAT_PLUGIN_FSET_COMPLETION_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_CONFIG_H
-#define WEECHAT_FSET_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_FSET_CONFIG_H
+#define WEECHAT_PLUGIN_FSET_CONFIG_H

 #define FSET_CONFIG_NAME "fset"

@@ -88,4 +88,4 @@ extern int fset_config_read ();
 extern int fset_config_write ();
 extern void fset_config_free ();

-#endif /* WEECHAT_FSET_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_FSET_CONFIG_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_INFO_H
-#define WEECHAT_FSET_INFO_H 1
+#ifndef WEECHAT_PLUGIN_FSET_INFO_H
+#define WEECHAT_PLUGIN_FSET_INFO_H

 extern void fset_info_init ();

-#endif /* WEECHAT_FSET_INFO_H */
+#endif /* WEECHAT_PLUGIN_FSET_INFO_H */
@@ -17,12 +17,12 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_MOUSE_H
-#define WEECHAT_FSET_MOUSE_H 1
+#ifndef WEECHAT_PLUGIN_FSET_MOUSE_H
+#define WEECHAT_PLUGIN_FSET_MOUSE_H

 #define FSET_MOUSE_HSIGNAL "fset_mouse"

 extern int fset_mouse_init ();
 extern void fset_mouse_end ();

-#endif /* WEECHAT_FSET_MOUSE_H */
+#endif /* WEECHAT_PLUGIN_FSET_MOUSE_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_OPTION_H
-#define WEECHAT_FSET_OPTION_H 1
+#ifndef WEECHAT_PLUGIN_FSET_OPTION_H
+#define WEECHAT_PLUGIN_FSET_OPTION_H

 #define FSET_OPTION_VALUE_NULL "null"

@@ -129,4 +129,4 @@ extern void fset_option_print_log ();
 extern int fset_option_init ();
 extern void fset_option_end ();

-#endif /* WEECHAT_FSET_OPTION_H */
+#endif /* WEECHAT_PLUGIN_FSET_OPTION_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_FSET_H
-#define WEECHAT_FSET_H 1
+#ifndef WEECHAT_PLUGIN_FSET_H
+#define WEECHAT_PLUGIN_FSET_H

 #define weechat_plugin weechat_fset_plugin
 #define FSET_PLUGIN_NAME "fset"
@@ -34,4 +34,4 @@ extern struct t_hdata *fset_hdata_fset_option;

 extern void fset_add_bar ();

-#endif /* WEECHAT_FSET_H */
+#endif /* WEECHAT_PLUGIN_FSET_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_GUILE_API_H
-#define WEECHAT_GUILE_API_H 1
+#ifndef WEECHAT_PLUGIN_GUILE_API_H
+#define WEECHAT_PLUGIN_GUILE_API_H

 extern int weechat_guile_api_buffer_input_data_cb (const void *pointer,
                                                   void *data,
@@ -29,4 +29,4 @@ extern int weechat_guile_api_buffer_close_cb (const void *pointer,
                                              struct t_gui_buffer *buffer);
 extern void weechat_guile_api_module_init (void *data);

-#endif /* WEECHAT_GUILE_API_H */
+#endif /* WEECHAT_PLUGIN_GUILE_API_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_GUILE_H
-#define WEECHAT_GUILE_H 1
+#ifndef WEECHAT_PLUGIN_GUILE_H
+#define WEECHAT_PLUGIN_GUILE_H

 #define weechat_plugin weechat_guile_plugin
 #define GUILE_PLUGIN_NAME "guile"
@@ -46,4 +46,4 @@ extern void *weechat_guile_exec (struct t_plugin_script *script,
 extern int weechat_guile_port_fill_input (SCM port);
 extern void weechat_guile_port_write (SCM port, const void *data, size_t size);

-#endif /* WEECHAT_GUILE_H */
+#endif /* WEECHAT_PLUGIN_GUILE_H */
@@ -17,10 +17,10 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_BAR_ITEM_H
-#define WEECHAT_IRC_BAR_ITEM_H 1
+#ifndef WEECHAT_PLUGIN_IRC_BAR_ITEM_H
+#define WEECHAT_PLUGIN_IRC_BAR_ITEM_H

 extern void irc_bar_item_update_channel ();
 extern void irc_bar_item_init ();

-#endif /* WEECHAT_IRC_BAR_ITEM_H */
+#endif /* WEECHAT_PLUGIN_IRC_BAR_ITEM_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_BUFFER_H
-#define WEECHAT_IRC_BUFFER_H 1
+#ifndef WEECHAT_PLUGIN_IRC_BUFFER_H
+#define WEECHAT_PLUGIN_IRC_BUFFER_H

 #define IRC_BUFFER_GET_SERVER(__buffer)                                 \
    struct t_weechat_plugin *buffer_plugin = NULL;                      \
@@ -56,4 +56,4 @@ extern int irc_buffer_nickcmp_cb (const void *pointer, void *data,
 extern struct t_gui_buffer *irc_buffer_search_server_lowest_number ();
 extern struct t_gui_buffer *irc_buffer_search_private_lowest_number (struct t_irc_server *server);

-#endif /* WEECHAT_IRC_BUFFER_H */
+#endif /* WEECHAT_PLUGIN_IRC_BUFFER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_CHANNEL_H
-#define WEECHAT_IRC_CHANNEL_H 1
+#ifndef WEECHAT_PLUGIN_IRC_CHANNEL_H
+#define WEECHAT_PLUGIN_IRC_CHANNEL_H

 #include <time.h>

@@ -168,4 +168,4 @@ extern int irc_channel_add_to_infolist (struct t_infolist *infolist,
                                        struct t_irc_channel *channel);
 extern void irc_channel_print_log (struct t_irc_channel *channel);

-#endif /* WEECHAT_IRC_CHANNEL_H */
+#endif /* WEECHAT_PLUGIN_IRC_CHANNEL_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_COLOR_H
-#define WEECHAT_IRC_COLOR_H 1
+#ifndef WEECHAT_PLUGIN_IRC_COLOR_H
+#define WEECHAT_PLUGIN_IRC_COLOR_H

 #define IRC_NUM_COLORS        100

@@ -114,4 +114,4 @@ extern char *irc_color_for_tags (const char *color);
 extern int irc_color_weechat_add_to_infolist (struct t_infolist *infolist);
 extern void irc_color_end ();

-#endif /* WEECHAT_IRC_COLOR_H */
+#endif /* WEECHAT_PLUGIN_IRC_COLOR_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_COMMAND_H
-#define WEECHAT_IRC_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_IRC_COMMAND_H
+#define WEECHAT_PLUGIN_IRC_COMMAND_H

 struct t_irc_server;
 struct t_irc_channel;
@@ -77,4 +77,4 @@ extern void irc_command_quit_server (struct t_irc_server *server,
                                     const char *arguments);
 extern void irc_command_init ();

-#endif /* WEECHAT_IRC_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_IRC_COMMAND_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_COMPLETION_H
-#define WEECHAT_IRC_COMPLETION_H 1
+#ifndef WEECHAT_PLUGIN_IRC_COMPLETION_H
+#define WEECHAT_PLUGIN_IRC_COMPLETION_H

 extern void irc_completion_init ();

-#endif /* WEECHAT_IRC_COMPLETION_H */
+#endif /* WEECHAT_PLUGIN_IRC_COMPLETION_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_CONFIG_H
-#define WEECHAT_IRC_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_IRC_CONFIG_H
+#define WEECHAT_PLUGIN_IRC_CONFIG_H

 #define IRC_CONFIG_NAME "irc"

@@ -215,4 +215,4 @@ extern int irc_config_read ();
 extern int irc_config_write (int write_temp_servers);
 extern void irc_config_free ();

-#endif /* WEECHAT_IRC_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_IRC_CONFIG_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_CTCP_H
-#define WEECHAT_IRC_CTCP_H 1
+#ifndef WEECHAT_PLUGIN_IRC_CTCP_H
+#define WEECHAT_PLUGIN_IRC_CTCP_H

 #include <time.h>

@@ -44,4 +44,4 @@ extern void irc_ctcp_recv (struct t_irc_server *server, time_t date,
                           const char *remote_nick, char *arguments,
                           char *message);

-#endif /* WEECHAT_IRC_CTCP_H */
+#endif /* WEECHAT_PLUGIN_IRC_CTCP_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_DEBUG_H
-#define WEECHAT_IRC_DEBUG_H 1
+#ifndef WEECHAT_PLUGIN_IRC_DEBUG_H
+#define WEECHAT_PLUGIN_IRC_DEBUG_H

 extern void irc_debug_init ();

-#endif /* WEECHAT_IRC_DEBUG_H */
+#endif /* WEECHAT_PLUGIN_IRC_DEBUG_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_IGNORE_H
-#define WEECHAT_IRC_IGNORE_H 1
+#ifndef WEECHAT_PLUGIN_IRC_IGNORE_H
+#define WEECHAT_PLUGIN_IRC_IGNORE_H

 #include <regex.h>

@@ -58,4 +58,4 @@ extern int irc_ignore_add_to_infolist (struct t_infolist *infolist,
                                       struct t_irc_ignore *ignore);
 extern void irc_ignore_print_log ();

-#endif /* WEECHAT_IRC_IGNORE_H */
+#endif /* WEECHAT_PLUGIN_IRC_IGNORE_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_INFO_H
-#define WEECHAT_IRC_INFO_H 1
+#ifndef WEECHAT_PLUGIN_IRC_INFO_H
+#define WEECHAT_PLUGIN_IRC_INFO_H

 extern void irc_info_init ();

-#endif /* WEECHAT_IRC_INFO_H */
+#endif /* WEECHAT_PLUGIN_IRC_INFO_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_INPUT_H
-#define WEECHAT_IRC_INPUT_H 1
+#ifndef WEECHAT_PLUGIN_IRC_INPUT_H
+#define WEECHAT_PLUGIN_IRC_INPUT_H

 struct t_gui_buffer;

@@ -31,4 +31,4 @@ extern int irc_input_send_cb (const void *pointer, void *data,
                              const char *signal, const char *type_data,
                              void *signal_data);

-#endif /* WEECHAT_IRC_INPUT_H */
+#endif /* WEECHAT_PLUGIN_IRC_INPUT_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_MESSAGE_H
-#define WEECHAT_IRC_MESSAGE_H 1
+#ifndef WEECHAT_PLUGIN_IRC_MESSAGE_H
+#define WEECHAT_PLUGIN_IRC_MESSAGE_H

 struct t_irc_server;
 struct t_irc_channel;
@@ -43,4 +43,4 @@ extern char *irc_message_replace_vars (struct t_irc_server *server,
 extern struct t_hashtable *irc_message_split (struct t_irc_server *server,
                                              const char *message);

-#endif /* WEECHAT_IRC_MESSAGE_H */
+#endif /* WEECHAT_PLUGIN_IRC_MESSAGE_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_MODE_H
-#define WEECHAT_IRC_MODE_H 1
+#ifndef WEECHAT_PLUGIN_IRC_MODE_H
+#define WEECHAT_PLUGIN_IRC_MODE_H

 struct t_irc_server;
 struct t_irc_channel;
@@ -31,4 +31,4 @@ extern int irc_mode_channel_set (struct t_irc_server *server,
 extern void irc_mode_user_set (struct t_irc_server *server, const char *modes,
                               int reset_modes);

-#endif /* WEECHAT_IRC_MODE_H */
+#endif /* WEECHAT_PLUGIN_IRC_MODE_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_MSGBUFFER_H
-#define WEECHAT_IRC_MSGBUFFER_H 1
+#ifndef WEECHAT_PLUGIN_IRC_MSGBUFFER_H
+#define WEECHAT_PLUGIN_IRC_MSGBUFFER_H

 enum t_irc_msgbuffer_target
 {
@@ -38,4 +38,4 @@ extern struct t_gui_buffer *irc_msgbuffer_get_target_buffer (struct t_irc_server
                                                             const char *alias,
                                                             struct t_gui_buffer *default_buffer);

-#endif /* WEECHAT_IRC_MSGBUFFER_H */
+#endif /* WEECHAT_PLUGIN_IRC_MSGBUFFER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_NICK_H
-#define WEECHAT_IRC_NICK_H 1
+#ifndef WEECHAT_PLUGIN_IRC_NICK_H
+#define WEECHAT_PLUGIN_IRC_NICK_H

 #define IRC_NICK_VALID_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHI"      \
    "JKLMNOPQRSTUVWXYZ0123456789-[]\\`_^{|}"
@@ -109,4 +109,4 @@ extern int irc_nick_add_to_infolist (struct t_infolist *infolist,
                                     struct t_irc_nick *nick);
 extern void irc_nick_print_log (struct t_irc_nick *nick);

-#endif /* WEECHAT_IRC_NICK_H */
+#endif /* WEECHAT_PLUGIN_IRC_NICK_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_NOTIFY_H
-#define WEECHAT_IRC_NOTIFY_H 1
+#ifndef WEECHAT_PLUGIN_IRC_NOTIFY_H
+#define WEECHAT_PLUGIN_IRC_NOTIFY_H

 struct t_irc_server;

@@ -75,4 +75,4 @@ extern void irc_notify_hook_timer_whois ();
 extern void irc_notify_init ();
 extern void irc_notify_end ();

-#endif /* WEECHAT_IRC_NOTIFY_H */
+#endif /* WEECHAT_PLUGIN_IRC_NOTIFY_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_PROTOCOL_H
-#define WEECHAT_IRC_PROTOCOL_H 1
+#ifndef WEECHAT_PLUGIN_IRC_PROTOCOL_H
+#define WEECHAT_PLUGIN_IRC_PROTOCOL_H

 #include <time.h>

@@ -91,4 +91,4 @@ extern void irc_protocol_recv_command (struct t_irc_server *server,
                                       const char *msg_command,
                                       const char *msg_channel);

-#endif /* WEECHAT_IRC_PROTOCOL_H */
+#endif /* WEECHAT_PLUGIN_IRC_PROTOCOL_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_RAW_H
-#define WEECHAT_IRC_RAW_H 1
+#ifndef WEECHAT_PLUGIN_IRC_RAW_H
+#define WEECHAT_PLUGIN_IRC_RAW_H

 #include <time.h>

@@ -61,4 +61,4 @@ extern void irc_raw_message_free_all ();
 extern int irc_raw_add_to_infolist (struct t_infolist *infolist,
                                    struct t_irc_raw_message *raw_message);

-#endif /* WEECHAT_IRC_RAW_H */
+#endif /* WEECHAT_PLUGIN_IRC_RAW_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_REDIRECT_H
-#define WEECHAT_IRC_REDIRECT_H 1
+#ifndef WEECHAT_PLUGIN_IRC_REDIRECT_H
+#define WEECHAT_PLUGIN_IRC_REDIRECT_H

 #include <time.h>

@@ -132,4 +132,4 @@ extern int irc_redirect_command_hsignal_cb (const void *pointer, void *data,
 extern void irc_redirect_init ();
 extern void irc_redirect_end ();

-#endif /* WEECHAT_IRC_REDIRECT_H */
+#endif /* WEECHAT_PLUGIN_IRC_REDIRECT_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_SASL_H
-#define WEECHAT_IRC_SASL_H 1
+#ifndef WEECHAT_PLUGIN_IRC_SASL_H
+#define WEECHAT_PLUGIN_IRC_SASL_H

 struct t_irc_server;

@@ -50,4 +50,4 @@ extern char *irc_sasl_mechanism_dh_aes (const char *data_base64,
                                        const char *sasl_username,
                                        const char *sasl_password);

-#endif /* WEECHAT_IRC_SASL_H */
+#endif /* WEECHAT_PLUGIN_IRC_SASL_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_SERVER_H
-#define WEECHAT_IRC_SERVER_H 1
+#ifndef WEECHAT_PLUGIN_IRC_SERVER_H
+#define WEECHAT_PLUGIN_IRC_SERVER_H

 #include <time.h>
 #include <sys/time.h>
@@ -377,4 +377,4 @@ extern int irc_server_add_to_infolist (struct t_infolist *infolist,
                                       struct t_irc_server *server);
 extern void irc_server_print_log ();

-#endif /* WEECHAT_IRC_SERVER_H */
+#endif /* WEECHAT_PLUGIN_IRC_SERVER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_UPGRADE_H
-#define WEECHAT_IRC_UPGRADE_H 1
+#ifndef WEECHAT_PLUGIN_IRC_UPGRADE_H
+#define WEECHAT_PLUGIN_IRC_UPGRADE_H

 #define IRC_UPGRADE_FILENAME "irc"

@@ -38,4 +38,4 @@ enum t_irc_upgrade_type
 extern int irc_upgrade_save ();
 extern int irc_upgrade_load ();

-#endif /* WEECHAT_IRC_UPGRADE_H */
+#endif /* WEECHAT_PLUGIN_IRC_UPGRADE_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_IRC_H
-#define WEECHAT_IRC_H 1
+#ifndef WEECHAT_PLUGIN_IRC_H
+#define WEECHAT_PLUGIN_IRC_H

 #define weechat_plugin weechat_irc_plugin
 #define IRC_PLUGIN_NAME "irc"
@@ -28,4 +28,4 @@ extern struct t_weechat_plugin *weechat_irc_plugin;

 extern int irc_signal_upgrade_received;

-#endif /* WEECHAT_IRC_H */
+#endif /* WEECHAT_PLUGIN_IRC_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_JS_API_H
-#define WEECHAT_JS_API_H 1
+#ifndef WEECHAT_PLUGIN_JS_API_H
+#define WEECHAT_PLUGIN_JS_API_H

 extern int weechat_js_api_buffer_input_data_cb (const void *pointer,
                                                void *data,
@@ -29,4 +29,4 @@ extern int weechat_js_api_buffer_close_cb (const void *pointer,
                                           void *data,
                                           struct t_gui_buffer *buffer);

-#endif /* WEECHAT_JS_API_H */
+#endif /* WEECHAT_PLUGIN_JS_API_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_JS_V8_H
-#define WEECHAT_JS_V8_H 1
+#ifndef WEECHAT_PLUGIN_JS_V8_H
+#define WEECHAT_PLUGIN_JS_V8_H

 #include <cstdio>
 #include <v8.h>
@@ -51,4 +51,4 @@ private:
    v8::Handle<v8::String> source;
 };

-#endif /* WEECHAT_JS_V8_H */
+#endif /* WEECHAT_PLUGIN_JS_V8_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_JS_H
-#define WEECHAT_JS_H 1
+#ifndef WEECHAT_PLUGIN_JS_H
+#define WEECHAT_PLUGIN_JS_H

 #include <v8.h>

@@ -59,4 +59,4 @@ extern void *weechat_js_exec (struct t_plugin_script *script,
                              int ret_type, const char *function,
                              const char *format, void **argv);

-#endif /* WEECHAT_JS_H */
+#endif /* WEECHAT_PLUGIN_JS_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LOGGER_BUFFER_H
-#define WEECHAT_LOGGER_BUFFER_H 1
+#ifndef WEECHAT_PLUGIN_LOGGER_BUFFER_H
+#define WEECHAT_PLUGIN_LOGGER_BUFFER_H

 struct t_infolist;

@@ -48,4 +48,4 @@ extern void logger_buffer_free (struct t_logger_buffer *logger_buffer);
 extern int logger_buffer_add_to_infolist (struct t_infolist *infolist,
                                          struct t_logger_buffer *logger_buffer);

-#endif /* WEECHAT_LOGGER_BUFFER_H */
+#endif /* WEECHAT_PLUGIN_LOGGER_BUFFER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LOGGER_CONFIG_H
-#define WEECHAT_LOGGER_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_LOGGER_CONFIG_H
+#define WEECHAT_PLUGIN_LOGGER_CONFIG_H

 #define LOGGER_CONFIG_NAME "logger"

@@ -47,4 +47,4 @@ extern int logger_config_read ();
 extern int logger_config_write ();
 extern void logger_config_free ();

-#endif /* WEECHAT_LOGGER_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_LOGGER_CONFIG_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LOGGER_INFO_H
-#define WEECHAT_LOGGER_INFO_H 1
+#ifndef WEECHAT_PLUGIN_LOGGER_INFO_H
+#define WEECHAT_PLUGIN_LOGGER_INFO_H

 extern void logger_info_init ();

-#endif /* WEECHAT_LOGGER_INFO_H */
+#endif /* WEECHAT_PLUGIN_LOGGER_INFO_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LOGGER_TAIL_H
-#define WEECHAT_LOGGER_TAIL_H 1
+#ifndef WEECHAT_PLUGIN_LOGGER_TAIL_H
+#define WEECHAT_PLUGIN_LOGGER_TAIL_H

 struct t_logger_line
 {
@@ -30,4 +30,4 @@ extern struct t_logger_line *logger_tail_file (const char *filename,
                                               int n_lines);
 extern void logger_tail_free (struct t_logger_line *lines);

-#endif /* WEECHAT_LOGGER_TAIL_H */
+#endif /* WEECHAT_PLUGIN_LOGGER_TAIL_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LOGGER_H
-#define WEECHAT_LOGGER_H 1
+#ifndef WEECHAT_PLUGIN_LOGGER_H
+#define WEECHAT_PLUGIN_LOGGER_H

 #define weechat_plugin weechat_logger_plugin
 #define LOGGER_PLUGIN_NAME "logger"
@@ -35,4 +35,4 @@ extern void logger_adjust_log_filenames ();
 extern int logger_timer_cb (const void *pointer, void *data,
                            int remaining_calls);

-#endif /* WEECHAT_LOGGER_H */
+#endif /* WEECHAT_PLUGIN_LOGGER_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LUA_API_H
-#define WEECHAT_LUA_API_H 1
+#ifndef WEECHAT_PLUGIN_LUA_API_H
+#define WEECHAT_PLUGIN_LUA_API_H

 extern struct luaL_Reg weechat_lua_api_funcs[];
 extern struct t_lua_const weechat_lua_api_consts[];
@@ -32,4 +32,4 @@ extern int weechat_lua_api_buffer_close_cb (const void *pointer,
                                            void *data,
                                            struct t_gui_buffer *buffer);

-#endif /* WEECHAT_LUA_API_H */
+#endif /* WEECHAT_PLUGIN_LUA_API_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_LUA_H
-#define WEECHAT_LUA_H 1
+#ifndef WEECHAT_PLUGIN_LUA_H
+#define WEECHAT_PLUGIN_LUA_H

 #define weechat_plugin weechat_lua_plugin
 #define LUA_PLUGIN_NAME "lua"
@@ -58,4 +58,4 @@ extern void weechat_lua_register_lib(lua_State *L, const char *libname,
                                     const luaL_Reg *lua_api_funcs,
                                     struct t_lua_const lua_api_consts[]);

-#endif /* WEECHAT_LUA_H */
+#endif /* WEECHAT_PLUGIN_LUA_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PERL_API_H
-#define WEECHAT_PERL_API_H 1
+#ifndef WEECHAT_PLUGIN_PERL_API_H
+#define WEECHAT_PLUGIN_PERL_API_H

 extern int weechat_perl_api_buffer_input_data_cb (const void *pointer,
                                                  void *data,
@@ -29,4 +29,4 @@ extern int weechat_perl_api_buffer_close_cb (const void *pointer,
                                             struct t_gui_buffer *buffer);
 extern void weechat_perl_api_init (pTHX);

-#endif /* WEECHAT_PERL_API_H */
+#endif /* WEECHAT_PLUGIN_PERL_API_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PERL_H
-#define WEECHAT_PERL_H 1
+#ifndef WEECHAT_PLUGIN_PERL_H
+#define WEECHAT_PLUGIN_PERL_H

 #define weechat_plugin weechat_perl_plugin
 #define PERL_PLUGIN_NAME "perl"
@@ -45,4 +45,4 @@ extern void *weechat_perl_exec (struct t_plugin_script *script,
                                int ret_type, const char *function,
                                const char *format, void **argv);

-#endif /* WEECHAT_PERL_H */
+#endif /* WEECHAT_PLUGIN_PERL_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PLUGIN_API_H
-#define WEECHAT_PLUGIN_API_H 1
+#ifndef WEECHAT_PLUGIN_PLUGIN_API_H
+#define WEECHAT_PLUGIN_PLUGIN_API_H

 #include <time.h>

@@ -73,4 +73,4 @@ extern void plugin_api_infolist_free (struct t_infolist *infolist);

 extern void plugin_api_init ();

-#endif /* WEECHAT_PLUGIN_API_H */
+#endif /* WEECHAT_PLUGIN_PLUGIN_API_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PLUGIN_CONFIG_H
-#define WEECHAT_PLUGIN_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_PLUGIN_CONFIG_H
+#define WEECHAT_PLUGIN_PLUGIN_CONFIG_H

 #define PLUGIN_CONFIG_NAME "plugins"

@@ -37,4 +37,4 @@ extern int plugin_config_read ();
 extern int plugin_config_write ();
 extern void plugin_config_end ();

-#endif /* WEECHAT_PLUGIN_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_PLUGIN_CONFIG_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PLUGIN_SCRIPT_API_H
-#define WEECHAT_PLUGIN_SCRIPT_API_H 1
+#ifndef WEECHAT_PLUGIN_PLUGIN_SCRIPT_API_H
+#define WEECHAT_PLUGIN_PLUGIN_SCRIPT_API_H

 #include <time.h>

@@ -370,4 +370,4 @@ extern struct t_upgrade_file *plugin_script_api_upgrade_new (struct t_weechat_pl
                                                             const char *function,
                                                             const char *data);

-#endif /* WEECHAT_PLUGIN_SCRIPT_API_H */
+#endif /* WEECHAT_PLUGIN_PLUGIN_SCRIPT_API_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PLUGIN_SCRIPT_H
-#define WEECHAT_PLUGIN_SCRIPT_H 1
+#ifndef WEECHAT_PLUGIN_PLUGIN_SCRIPT_H
+#define WEECHAT_PLUGIN_PLUGIN_SCRIPT_H

 /* constants which defines return types for weechat_<lang>_exec functions */

@@ -182,4 +182,4 @@ extern void plugin_script_end (struct t_weechat_plugin *weechat_plugin,
 extern void plugin_script_print_log (struct t_weechat_plugin *weechat_plugin,
                                     struct t_plugin_script *scripts);

-#endif /* WEECHAT_PLUGIN_SCRIPT_H */
+#endif /* WEECHAT_PLUGIN_PLUGIN_SCRIPT_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PLUGIN_H
-#define WEECHAT_PLUGIN_H 1
+#ifndef WEECHAT_PLUGIN_PLUGIN_H
+#define WEECHAT_PLUGIN_PLUGIN_H

 #include "weechat-plugin.h"

@@ -56,4 +56,4 @@ extern int plugin_add_to_infolist (struct t_infolist *infolist,
                                   struct t_weechat_plugin *plugin);
 extern void plugin_print_log ();

-#endif /* WEECHAT_PLUGIN_H */
+#endif /* WEECHAT_PLUGIN_PLUGIN_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PYTHON_API_H
-#define WEECHAT_PYTHON_API_H 1
+#ifndef WEECHAT_PLUGIN_PYTHON_API_H
+#define WEECHAT_PLUGIN_PYTHON_API_H

 extern PyMethodDef weechat_python_funcs[];

@@ -31,4 +31,4 @@ extern int weechat_python_api_buffer_close_cb (const void *pointer,
                                               void *data,
                                               struct t_gui_buffer *buffer);

-#endif /* WEECHAT_PYTHON_API_H */
+#endif /* WEECHAT_PLUGIN_PYTHON_API_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_PYTHON_H
-#define WEECHAT_PYTHON_H 1
+#ifndef WEECHAT_PLUGIN_PYTHON_H
+#define WEECHAT_PLUGIN_PYTHON_H

 #define weechat_plugin weechat_python_plugin
 #define PYTHON_PLUGIN_NAME "python"
@@ -61,4 +61,4 @@ extern void *weechat_python_exec (struct t_plugin_script *script,
                                  int ret_type, const char *function,
                                  char *format, void **argv);

-#endif /* WEECHAT_PYTHON_H */
+#endif /* WEECHAT_PLUGIN_PYTHON_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_IRC_H
-#define WEECHAT_RELAY_IRC_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_IRC_H
+#define WEECHAT_PLUGIN_RELAY_IRC_H

 struct t_relay_client;

@@ -74,4 +74,4 @@ extern int relay_irc_add_to_infolist (struct t_infolist_item *item,
                                      struct t_relay_client *client);
 extern void relay_irc_print_log (struct t_relay_client *client);

-#endif /* WEECHAT_RELAY_IRC_H */
+#endif /* WEECHAT_PLUGIN_RELAY_IRC_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_BUFFER_H
-#define WEECHAT_RELAY_BUFFER_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_BUFFER_H
+#define WEECHAT_PLUGIN_RELAY_BUFFER_H

 #define RELAY_BUFFER_NAME "relay.list"

@@ -33,4 +33,4 @@ extern int relay_buffer_close_cb (const void *pointer, void *data,
                                  struct t_gui_buffer *buffer);
 extern void relay_buffer_open ();

-#endif /* WEECHAT_RELAY_BUFFER_H */
+#endif /* WEECHAT_PLUGIN_RELAY_BUFFER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_CLIENT_H
-#define WEECHAT_RELAY_CLIENT_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_CLIENT_H
+#define WEECHAT_PLUGIN_RELAY_CLIENT_H

 #include <time.h>

@@ -153,4 +153,4 @@ extern int relay_client_add_to_infolist (struct t_infolist *infolist,
                                         struct t_relay_client *client);
 extern void relay_client_print_log ();

-#endif /* WEECHAT_RELAY_CLIENT_H */
+#endif /* WEECHAT_PLUGIN_RELAY_CLIENT_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_COMMAND_H
-#define WEECHAT_RELAY_COMMAND_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_COMMAND_H
+#define WEECHAT_PLUGIN_RELAY_COMMAND_H

 extern void relay_command_init ();

-#endif /* WEECHAT_RELAY_COMMAND_H */
+#endif /* WEECHAT_PLUGIN_RELAY_COMMAND_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_COMPLETION_H
-#define WEECHAT_RELAY_COMPLETION_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_COMPLETION_H
+#define WEECHAT_PLUGIN_RELAY_COMPLETION_H

 extern void relay_completion_init ();

-#endif /* WEECHAT_RELAY_COMPLETION_H */
+#endif /* WEECHAT_PLUGIN_RELAY_COMPLETION_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_CONFIG_H
-#define WEECHAT_RELAY_CONFIG_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_CONFIG_H
+#define WEECHAT_PLUGIN_RELAY_CONFIG_H

 #include <regex.h>

@@ -69,4 +69,4 @@ extern int relay_config_read ();
 extern int relay_config_write ();
 extern void relay_config_free ();

-#endif /* WEECHAT_RELAY_CONFIG_H */
+#endif /* WEECHAT_PLUGIN_RELAY_CONFIG_H */
@@ -17,9 +17,9 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_INFO_H
-#define WEECHAT_RELAY_INFO_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_INFO_H
+#define WEECHAT_PLUGIN_RELAY_INFO_H

 extern void relay_info_init ();

-#endif /* WEECHAT_RELAY_INFO_H */
+#endif /* WEECHAT_PLUGIN_RELAY_INFO_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_NETWORK_H
-#define WEECHAT_RELAY_NETWORK_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_NETWORK_H
+#define WEECHAT_PLUGIN_RELAY_NETWORK_H

 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
@@ -38,4 +38,4 @@ extern void relay_network_set_priority ();
 extern void relay_network_init ();
 extern void relay_network_end ();

-#endif /* WEECHAT_RELAY_NETWORK_H */
+#endif /* WEECHAT_PLUGIN_RELAY_NETWORK_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_RAW_H
-#define WEECHAT_RELAY_RAW_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_RAW_H
+#define WEECHAT_PLUGIN_RELAY_RAW_H

 #include <time.h>

@@ -58,4 +58,4 @@ extern void relay_raw_message_free_all ();
 extern int relay_raw_add_to_infolist (struct t_infolist *infolist,
                                      struct t_relay_raw_message *raw_message);

-#endif /* WEECHAT_RELAY_RAW_H */
+#endif /* WEECHAT_PLUGIN_RELAY_RAW_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_SERVER_H
-#define WEECHAT_RELAY_SERVER_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_SERVER_H
+#define WEECHAT_PLUGIN_RELAY_SERVER_H

 #include <time.h>

@@ -68,4 +68,4 @@ extern int relay_server_add_to_infolist (struct t_infolist *infolist,
                                         struct t_relay_server *server);
 extern void relay_server_print_log ();

-#endif /* WEECHAT_RELAY_SERVER_H */
+#endif /* WEECHAT_PLUGIN_RELAY_SERVER_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_UPGRADE_H
-#define WEECHAT_RELAY_UPGRADE_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_UPGRADE_H
+#define WEECHAT_PLUGIN_RELAY_UPGRADE_H

 #define RELAY_UPGRADE_FILENAME "relay"

@@ -34,4 +34,4 @@ enum t_relay_upgrade_type
 extern int relay_upgrade_save ();
 extern int relay_upgrade_load ();

-#endif /* WEECHAT_RELAY_UPGRADE_H */
+#endif /* WEECHAT_PLUGIN_RELAY_UPGRADE_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_WEBSOCKET_H
-#define WEECHAT_RELAY_WEBSOCKET_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_WEBSOCKET_H
+#define WEECHAT_PLUGIN_RELAY_WEBSOCKET_H

 #define WEBSOCKET_FRAME_OPCODE_CONTINUATION 0x00
 #define WEBSOCKET_FRAME_OPCODE_TEXT         0x01
@@ -43,4 +43,4 @@ extern char *relay_websocket_encode_frame (int opcode,
                                           unsigned long long length,
                                           unsigned long long *length_frame);

-#endif /* WEECHAT_RELAY_WEBSOCKET_H */
+#endif /* WEECHAT_PLUGIN_RELAY_WEBSOCKET_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_H
-#define WEECHAT_RELAY_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_H
+#define WEECHAT_PLUGIN_RELAY_H

 #define weechat_plugin weechat_relay_plugin
 #define RELAY_PLUGIN_NAME "relay"
@@ -46,4 +46,4 @@ extern char *relay_protocol_string[];

 extern int relay_protocol_search (const char *name);

-#endif /* WEECHAT_RELAY_H */
+#endif /* WEECHAT_PLUGIN_RELAY_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_WEECHAT_MSG_H
-#define WEECHAT_RELAY_WEECHAT_MSG_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_WEECHAT_MSG_H
+#define WEECHAT_PLUGIN_RELAY_WEECHAT_MSG_H

 #include <time.h>

@@ -83,4 +83,4 @@ extern void relay_weechat_msg_send (struct t_relay_client *client,
                                    struct t_relay_weechat_msg *msg);
 extern void relay_weechat_msg_free (struct t_relay_weechat_msg *msg);

-#endif /* WEECHAT_RELAY_WEECHAT_MSG_H */
+#endif /* WEECHAT_PLUGIN_RELAY_WEECHAT_MSG_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_WEECHAT_NICKLIST_H
-#define WEECHAT_RELAY_WEECHAT_NICKLIST_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_WEECHAT_NICKLIST_H
+#define WEECHAT_PLUGIN_RELAY_WEECHAT_NICKLIST_H

 #define RELAY_WEECHAT_NICKLIST_DIFF_UNKNOWN ' '
 #define RELAY_WEECHAT_NICKLIST_DIFF_PARENT  '^'
@@ -54,4 +54,4 @@ extern void relay_weechat_nicklist_add_item (struct t_relay_weechat_nicklist *ni
                                             struct t_gui_nick *nick);
 extern void relay_weechat_nicklist_free (struct t_relay_weechat_nicklist *nicklist);

-#endif /* WEECHAT_RELAY_WEECHAT_NICKLIST_H */
+#endif /* WEECHAT_PLUGIN_RELAY_WEECHAT_NICKLIST_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_WEECHAT_PROTOCOL_H
-#define WEECHAT_RELAY_WEECHAT_PROTOCOL_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_WEECHAT_PROTOCOL_H
+#define WEECHAT_PLUGIN_RELAY_WEECHAT_PROTOCOL_H

 #define RELAY_WEECHAT_PROTOCOL_SYNC_BUFFER   1
 #define RELAY_WEECHAT_PROTOCOL_SYNC_NICKLIST 2
@@ -101,4 +101,4 @@ extern int relay_weechat_protocol_timer_nicklist_cb (const void *pointer,
 extern void relay_weechat_protocol_recv (struct t_relay_client *client,
                                         const char *data);

-#endif /* WEECHAT_RELAY_WEECHAT_PROTOCOL_H */
+#endif /* WEECHAT_PLUGIN_RELAY_WEECHAT_PROTOCOL_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RELAY_WEECHAT_H
-#define WEECHAT_RELAY_WEECHAT_H 1
+#ifndef WEECHAT_PLUGIN_RELAY_WEECHAT_H
+#define WEECHAT_PLUGIN_RELAY_WEECHAT_H

 struct t_relay_client;

@@ -63,4 +63,4 @@ extern int relay_weechat_add_to_infolist (struct t_infolist_item *item,
                                          struct t_relay_client *client);
 extern void relay_weechat_print_log (struct t_relay_client *client);

-#endif /* WEECHAT_RELAY_WEECHAT_H */
+#endif /* WEECHAT_PLUGIN_RELAY_WEECHAT_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RUBY_API_H
-#define WEECHAT_RUBY_API_H 1
+#ifndef WEECHAT_PLUGIN_RUBY_API_H
+#define WEECHAT_PLUGIN_RUBY_API_H

 extern int weechat_ruby_api_buffer_input_data_cb (const void *pointer,
                                                  void *data,
@@ -30,4 +30,4 @@ extern int weechat_ruby_api_buffer_close_cb (const void *pointer,
                                             struct t_gui_buffer *buffer);
 extern void weechat_ruby_api_init (VALUE ruby_mWeechat);

-#endif /* WEECHAT_RUBY_API_H */
+#endif /* WEECHAT_PLUGIN_RUBY_API_H */
@@ -18,8 +18,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_RUBY_H
-#define WEECHAT_RUBY_H 1
+#ifndef WEECHAT_PLUGIN_RUBY_H
+#define WEECHAT_PLUGIN_RUBY_H

 #define weechat_plugin weechat_ruby_plugin
 #define RUBY_PLUGIN_NAME "ruby"
@@ -45,4 +45,4 @@ void *weechat_ruby_exec (struct t_plugin_script *script,
                         int ret_type, const char *function,
                         const char *format, void **argv);

-#endif /* WEECHAT_RUBY_H */
+#endif /* WEECHAT_PLUGIN_RUBY_H */
@@ -17,8 +17,8 @@
 * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef WEECHAT_SCRIPT_ACTION_H
-#define WEECHAT_SCRIPT_ACTION_H 1
+#ifndef WEECHAT_PLUGIN_SCRIPT_ACTION_H
+#define WEECHAT_PLUGIN_SCRIPT_ACTION_H

 extern char *script_actions;

@@ -26,4 +26,4 @@ extern int script_action_run ();
 extern void script_action_schedule (const char *action, int need_repository,
                                    int quiet);

-#endif /* WEECHAT_SCRIPT_ACTION_H */
+#endif /* WEECHAT_PLUGIN_SCRIPT_ACTION_H */
--- a/Show More
+++ b/Show More