billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=a6ca0111de1eab6abe2fc40090cd10dfccde8489
commit a6ca0111de1eab6abe2fc40090cd10dfccde8489 Author: Koichi Murase <[email protected]> Date: Fri Mar 4 23:14:11 2022 +0900 *.h: do not use the C reserved identifiers for the include guards --- src/bin/about.h | 4 ++-- src/bin/backlog.h | 4 ++-- src/bin/colors.h | 4 ++-- src/bin/config.h | 4 ++-- src/bin/controls.h | 4 ++-- src/bin/extns.h | 4 ++-- src/bin/gravatar.h | 4 ++-- src/bin/ipc.h | 4 ++-- src/bin/keyin.h | 4 ++-- src/bin/main.h | 4 ++-- src/bin/md5.h | 4 ++-- src/bin/media.h | 4 ++-- src/bin/miniview.h | 4 ++-- src/bin/options.h | 4 ++-- src/bin/options_background.h | 4 ++-- src/bin/options_behavior.h | 4 ++-- src/bin/options_colors.h | 4 ++-- src/bin/options_elm.h | 4 ++-- src/bin/options_font.h | 4 ++-- src/bin/options_keys.h | 4 ++-- src/bin/options_mouse.h | 4 ++-- src/bin/options_theme.h | 4 ++-- src/bin/options_themepv.h | 4 ++-- src/bin/private.h | 4 ++-- src/bin/sb.h | 4 ++-- src/bin/sel.h | 4 ++-- src/bin/term_container.h | 4 ++-- src/bin/termcmd.h | 4 ++-- src/bin/termio.h | 4 ++-- src/bin/termiointernals.h | 4 ++-- src/bin/termiolink.h | 4 ++-- src/bin/termpty.h | 4 ++-- src/bin/termptydbl.h | 4 ++-- src/bin/termptyesc.h | 4 ++-- src/bin/termptyext.h | 4 ++-- src/bin/termptygfx.h | 4 ++-- src/bin/termptyops.h | 4 ++-- src/bin/theme.h | 4 ++-- src/bin/tycommon.h | 4 ++-- src/bin/tytest.h | 4 ++-- src/bin/tytest_common.h | 4 ++-- src/bin/unit_tests.h | 4 ++-- src/bin/utf8.h | 4 ++-- src/bin/utils.h | 4 ++-- src/bin/win.h | 4 ++-- tools/unicode_dbl_width.py | 4 ++-- 46 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/bin/about.h b/src/bin/about.h index 05bda9e..a054a48 100644 --- a/src/bin/about.h +++ b/src/bin/about.h @@ -1,5 +1,5 @@ -#ifndef _ABOUT_H__ -#define _ABOUT_H__ 1 +#ifndef TERMINOLOGY_ABOUT_H_ +#define TERMINOLOGY_ABOUT_H_ 1 void about_show(Evas_Object *win, Evas_Object *base, Evas_Object *term, void (*donecb) (void *data), void *donedata); diff --git a/src/bin/backlog.h b/src/bin/backlog.h index ec0102f..1a1e054 100644 --- a/src/bin/backlog.h +++ b/src/bin/backlog.h @@ -1,5 +1,5 @@ -#ifndef _BACKLOG_H__ -#define _BACKLOG_H__ 1 +#ifndef TERMINOLOGY_BACKLOG_H_ +#define TERMINOLOGY_BACKLOG_H_ 1 void termpty_save_register(Termpty *ty); void termpty_save_unregister(Termpty *ty); diff --git a/src/bin/colors.h b/src/bin/colors.h index e293080..0020fd2 100644 --- a/src/bin/colors.h +++ b/src/bin/colors.h @@ -1,5 +1,5 @@ -#ifndef _COLORS_H__ -#define _COLORS_H__ 1 +#ifndef TERMINOLOGY_COLORS_H_ +#define TERMINOLOGY_COLORS_H_ 1 #include <Evas.h> #include "config.h" diff --git a/src/bin/config.h b/src/bin/config.h index fd3c7b1..c64f3f8 100644 --- a/src/bin/config.h +++ b/src/bin/config.h @@ -1,5 +1,5 @@ -#ifndef _CONFIG_H__ -#define _CONFIG_H__ 1 +#ifndef TERMINOLOGY_CONFIG_H_ +#define TERMINOLOGY_CONFIG_H_ 1 #include <Evas.h> diff --git a/src/bin/controls.h b/src/bin/controls.h index 7a50fc1..4d658fe 100644 --- a/src/bin/controls.h +++ b/src/bin/controls.h @@ -1,5 +1,5 @@ -#ifndef _CONTROLS_H__ -#define _CONTROLS_H__ 1 +#ifndef TERMINOLOGY_CONTROLS_H_ +#define TERMINOLOGY_CONTROLS_H_ 1 void controls_show(Evas_Object *win, Evas_Object *base, Evas_Object *bg, Evas_Object *term, diff --git a/src/bin/extns.h b/src/bin/extns.h index cddeefb..3ee81e7 100644 --- a/src/bin/extns.h +++ b/src/bin/extns.h @@ -1,5 +1,5 @@ -#ifndef _EXTNS_H__ -#define _EXTNS_H__ 1 +#ifndef TERMINOLOGY_EXTNS_H_ +#define TERMINOLOGY_EXTNS_H_ 1 extern const char *extn_img[]; extern const char *extn_scale[]; diff --git a/src/bin/gravatar.h b/src/bin/gravatar.h index 8e05cb9..a68987c 100644 --- a/src/bin/gravatar.h +++ b/src/bin/gravatar.h @@ -1,5 +1,5 @@ -#ifndef _GRAVATAR_H__ -#define _GRAVATAR_H__ 1 +#ifndef TERMINOLOGY_GRAVATAR_H_ +#define TERMINOLOGY_GRAVATAR_H_ 1 #include "config.h" diff --git a/src/bin/ipc.h b/src/bin/ipc.h index 852915d..17a8cd5 100644 --- a/src/bin/ipc.h +++ b/src/bin/ipc.h @@ -1,5 +1,5 @@ -#ifndef _IPC_H__ -#define _IPC_H__ 1 +#ifndef TERMINOLOGY_IPC_H_ +#define TERMINOLOGY_IPC_H_ 1 #include "config.h" diff --git a/src/bin/keyin.h b/src/bin/keyin.h index ccfa644..9d999d9 100644 --- a/src/bin/keyin.h +++ b/src/bin/keyin.h @@ -1,5 +1,5 @@ -#ifndef _KEYIN_H__ -#define _KEYIN_H__ 1 +#ifndef TERMINOLOGY_KEYIN_H_ +#define TERMINOLOGY_KEYIN_H_ 1 typedef struct _Keys_Handler Keys_Handler; diff --git a/src/bin/main.h b/src/bin/main.h index e870b32..9ff533e 100644 --- a/src/bin/main.h +++ b/src/bin/main.h @@ -1,5 +1,5 @@ -#ifndef _MAIN_H__ -#define _MAIN_H__ 1 +#ifndef TERMINOLOGY_MAIN_H_ +#define TERMINOLOGY_MAIN_H_ 1 #include "config.h" diff --git a/src/bin/md5.h b/src/bin/md5.h index cca8e8c..a36307d 100644 --- a/src/bin/md5.h +++ b/src/bin/md5.h @@ -1,5 +1,5 @@ -#ifndef _MD5_H_ -#define _MD5_H_ +#ifndef TERMINOLOGY_MD5_H_ +#define TERMINOLOGY_MD5_H_ #include <stdint.h> #include <sys/types.h> diff --git a/src/bin/media.h b/src/bin/media.h index 76df6e5..06d47e0 100644 --- a/src/bin/media.h +++ b/src/bin/media.h @@ -1,5 +1,5 @@ -#ifndef _MEDIA_H__ -#define _MEDIA_H__ 1 +#ifndef TERMINOLOGY_MEDIA_H_ +#define TERMINOLOGY_MEDIA_H_ 1 #define MEDIA_SIZE_MASK 0x000f #define MEDIA_OPTIONS_MASK 0x00f0 diff --git a/src/bin/miniview.h b/src/bin/miniview.h index 43b6b45..07a37dc 100644 --- a/src/bin/miniview.h +++ b/src/bin/miniview.h @@ -1,5 +1,5 @@ -#ifndef _MINIVIEW_H__ -#define _MINIVIEW_H__ 1 +#ifndef TERMINOLOGY_MINIVIEW_H_ +#define TERMINOLOGY_MINIVIEW_H_ 1 #include "termpty.h" diff --git a/src/bin/options.h b/src/bin/options.h index 17325ed..d3ec8b8 100644 --- a/src/bin/options.h +++ b/src/bin/options.h @@ -1,5 +1,5 @@ -#ifndef _TERMINOLOGY_OPTIONS_H__ -#define _TERMINOLOGY_OPTIONS_H__ 1 +#ifndef TERMINOLOGY_TERMINOLOGY_OPTIONS_H_ +#define TERMINOLOGY_TERMINOLOGY_OPTIONS_H_ 1 void options_show(Evas_Object *win, Evas_Object *base, Evas_Object *bg, Evas_Object *term, diff --git a/src/bin/options_background.h b/src/bin/options_background.h index 07f5d37..a0c739a 100644 --- a/src/bin/options_background.h +++ b/src/bin/options_background.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_BACKGROUND_H__ -#define _OPTIONS_BACKGROUND_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_BACKGROUND_H_ +#define TERMINOLOGY_OPTIONS_BACKGROUND_H_ 1 void options_background(Evas_Object *opbox, Evas_Object *term); void options_background_clear(void); diff --git a/src/bin/options_behavior.h b/src/bin/options_behavior.h index 8aa8608..700efe6 100644 --- a/src/bin/options_behavior.h +++ b/src/bin/options_behavior.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_BEHAVIOR_H__ -#define _OPTIONS_BEHAVIOR_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_BEHAVIOR_H_ +#define TERMINOLOGY_OPTIONS_BEHAVIOR_H_ 1 void options_behavior(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_colors.h b/src/bin/options_colors.h index 0512d98..157db7b 100644 --- a/src/bin/options_colors.h +++ b/src/bin/options_colors.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_COLORS_H__ -#define _OPTIONS_COLORS_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_COLORS_H_ +#define TERMINOLOGY_OPTIONS_COLORS_H_ 1 void options_colors(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_elm.h b/src/bin/options_elm.h index e4774a9..28855c4 100644 --- a/src/bin/options_elm.h +++ b/src/bin/options_elm.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_ELM_H__ -#define _OPTIONS_ELM_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_ELM_H_ +#define TERMINOLOGY_OPTIONS_ELM_H_ 1 void options_elm(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_font.h b/src/bin/options_font.h index 5ff2c5e..af37a99 100644 --- a/src/bin/options_font.h +++ b/src/bin/options_font.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_FONT_H__ -#define _OPTIONS_FONT_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_FONT_H_ +#define TERMINOLOGY_OPTIONS_FONT_H_ 1 void options_font(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_keys.h b/src/bin/options_keys.h index 1fbc285..a82ea56 100644 --- a/src/bin/options_keys.h +++ b/src/bin/options_keys.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_KEYS_H__ -#define _OPTIONS_KEYS_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_KEYS_H_ +#define TERMINOLOGY_OPTIONS_KEYS_H_ 1 void options_keys(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_mouse.h b/src/bin/options_mouse.h index 480887f..bd244b9 100644 --- a/src/bin/options_mouse.h +++ b/src/bin/options_mouse.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_MOUSE_H__ -#define _OPTIONS_MOUSE_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_MOUSE_H_ +#define TERMINOLOGY_OPTIONS_MOUSE_H_ 1 void options_mouse(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_theme.h b/src/bin/options_theme.h index dcd8c1a..e67bdbf 100644 --- a/src/bin/options_theme.h +++ b/src/bin/options_theme.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_THEME_H__ -#define _OPTIONS_THEME_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_THEME_H_ +#define TERMINOLOGY_OPTIONS_THEME_H_ 1 void options_theme(Evas_Object *opbox, Evas_Object *term); diff --git a/src/bin/options_themepv.h b/src/bin/options_themepv.h index f4f8a48..9487fb2 100644 --- a/src/bin/options_themepv.h +++ b/src/bin/options_themepv.h @@ -1,5 +1,5 @@ -#ifndef _OPTIONS_THEMEPV_H__ -#define _OPTIONS_THEMEPV_H__ 1 +#ifndef TERMINOLOGY_OPTIONS_THEMEPV_H_ +#define TERMINOLOGY_OPTIONS_THEMEPV_H_ 1 #include "colors.h" Evas_Object * diff --git a/src/bin/private.h b/src/bin/private.h index c201f23..7fa997c 100644 --- a/src/bin/private.h +++ b/src/bin/private.h @@ -1,5 +1,5 @@ -#ifndef _PRIVATE_H__ -#define _PRIVATE_H__ 1 +#ifndef TERMINOLOGY_PRIVATE_H_ +#define TERMINOLOGY_PRIVATE_H_ 1 #ifdef HAVE_CONFIG_H #include "terminology_config.h" diff --git a/src/bin/sb.h b/src/bin/sb.h index 1df238b..0a9f4db 100644 --- a/src/bin/sb.h +++ b/src/bin/sb.h @@ -1,5 +1,5 @@ -#ifndef _SB_H__ -#define _SB_H__ +#ifndef TERMINOLOGY_SB_H_ +#define TERMINOLOGY_SB_H_ #include <stddef.h> diff --git a/src/bin/sel.h b/src/bin/sel.h index 0dcd12a..ff8acf6 100644 --- a/src/bin/sel.h +++ b/src/bin/sel.h @@ -1,5 +1,5 @@ -#ifndef _SEL_H__ -#define _SEL_H__ 1 +#ifndef TERMINOLOGY_SEL_H_ +#define TERMINOLOGY_SEL_H_ 1 #include "config.h" diff --git a/src/bin/term_container.h b/src/bin/term_container.h index c420670..6a20eaa 100644 --- a/src/bin/term_container.h +++ b/src/bin/term_container.h @@ -1,5 +1,5 @@ -#ifndef _TERM_CONTAINER_H__ -#define _TERM_CONTAINER_H__ 1 +#ifndef TERMINOLOGY_TERM_CONTAINER_H_ +#define TERMINOLOGY_TERM_CONTAINER_H_ 1 typedef struct _Term_Container Term_Container; diff --git a/src/bin/termcmd.h b/src/bin/termcmd.h index 51b0ed2..5bd2907 100644 --- a/src/bin/termcmd.h +++ b/src/bin/termcmd.h @@ -1,5 +1,5 @@ -#ifndef _TERMCMD_H__ -#define _TERMCMD_H__ 1 +#ifndef TERMINOLOGY_TERMCMD_H_ +#define TERMINOLOGY_TERMCMD_H_ 1 #include "config.h" diff --git a/src/bin/termio.h b/src/bin/termio.h index 9a5a64d..997f6ed 100644 --- a/src/bin/termio.h +++ b/src/bin/termio.h @@ -1,5 +1,5 @@ -#ifndef _TERMIO_H__ -#define _TERMIO_H__ 1 +#ifndef TERMINOLOGY_TERMIO_H_ +#define TERMINOLOGY_TERMIO_H_ 1 #include "config.h" #include "main.h" diff --git a/src/bin/termiointernals.h b/src/bin/termiointernals.h index 86e6978..a3d23cf 100644 --- a/src/bin/termiointernals.h +++ b/src/bin/termiointernals.h @@ -1,5 +1,5 @@ -#ifndef _TERMIOINTERNALS_H__ -#define _TERMIOINTERNALS_H__ 1 +#ifndef TERMINOLOGY_TERMIOINTERNALS_H_ +#define TERMINOLOGY_TERMIOINTERNALS_H_ 1 #if defined(BINARY_TYFUZZ) || defined(BINARY_TYTEST) typedef void Term; diff --git a/src/bin/termiolink.h b/src/bin/termiolink.h index 3c0ed58..6651d2b 100644 --- a/src/bin/termiolink.h +++ b/src/bin/termiolink.h @@ -1,5 +1,5 @@ -#ifndef _TERMIO_LINK_H__ -#define _TERMIO_LINK_H__ 1 +#ifndef TERMINOLOGY_TERMIO_LINK_H_ +#define TERMINOLOGY_TERMIO_LINK_H_ 1 char *termio_link_find(const Evas_Object *obj, int cx, int cy, int *x1r, int *y1r, int *x2r, int *y2r); Eina_Bool diff --git a/src/bin/termpty.h b/src/bin/termpty.h index e252361..461d5b4 100644 --- a/src/bin/termpty.h +++ b/src/bin/termpty.h @@ -1,5 +1,5 @@ -#ifndef _TERMPTY_H__ -#define _TERMPTY_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_H_ +#define TERMINOLOGY_TERMPTY_H_ 1 #include "config.h" #include "media.h" diff --git a/src/bin/termptydbl.h b/src/bin/termptydbl.h index ca365b2..0ac3f0a 100644 --- a/src/bin/termptydbl.h +++ b/src/bin/termptydbl.h @@ -1,6 +1,6 @@ /* XXX: Code generated by tool unicode_dbl_width.py */ -#ifndef _TERMPTY_DBL_H__ -#define _TERMPTY_DBL_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_DBL_H_ +#define TERMINOLOGY_TERMPTY_DBL_H_ 1 Eina_Bool _termpty_is_wide(const Eina_Unicode g); Eina_Bool _termpty_is_ambigous_wide(const Eina_Unicode g); diff --git a/src/bin/termptyesc.h b/src/bin/termptyesc.h index 6fed70b..2b353e5 100644 --- a/src/bin/termptyesc.h +++ b/src/bin/termptyesc.h @@ -1,5 +1,5 @@ -#ifndef _TERMPTY_ESC_H__ -#define _TERMPTY_ESC_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_ESC_H_ +#define TERMINOLOGY_TERMPTY_ESC_H_ 1 int termpty_handle_seq(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode *ce); const char * EINA_PURE termptyesc_safechar(const unsigned int c); diff --git a/src/bin/termptyext.h b/src/bin/termptyext.h index 020219c..3ceeb83 100644 --- a/src/bin/termptyext.h +++ b/src/bin/termptyext.h @@ -1,5 +1,5 @@ -#ifndef _TERMPTY_EXT_H__ -#define _TERMPTY_EXT_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_EXT_H_ +#define TERMINOLOGY_TERMPTY_EXT_H_ 1 Eina_Bool termpty_ext_handle(Termpty *ty, diff --git a/src/bin/termptygfx.h b/src/bin/termptygfx.h index eaeaa7b..67a5261 100644 --- a/src/bin/termptygfx.h +++ b/src/bin/termptygfx.h @@ -1,5 +1,5 @@ -#ifndef _TERMPTY_GFX_H__ -#define _TERMPTY_GFX_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_GFX_H_ +#define TERMINOLOGY_TERMPTY_GFX_H_ 1 #include "termpty.h" diff --git a/src/bin/termptyops.h b/src/bin/termptyops.h index bb0b11c..60d105a 100644 --- a/src/bin/termptyops.h +++ b/src/bin/termptyops.h @@ -1,5 +1,5 @@ -#ifndef _TERMPTY_OPS_H__ -#define _TERMPTY_OPS_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_OPS_H_ +#define TERMINOLOGY_TERMPTY_OPS_H_ 1 typedef enum _Termpty_Clear { diff --git a/src/bin/theme.h b/src/bin/theme.h index 4acce3b..66950b3 100644 --- a/src/bin/theme.h +++ b/src/bin/theme.h @@ -1,5 +1,5 @@ -#ifndef _THEME_H__ -#define _THEME_H__ +#ifndef TERMINOLOGY_THEME_H_ +#define TERMINOLOGY_THEME_H_ #include <Evas.h> #include "config.h" diff --git a/src/bin/tycommon.h b/src/bin/tycommon.h index 7688b3a..69b9fcb 100644 --- a/src/bin/tycommon.h +++ b/src/bin/tycommon.h @@ -1,5 +1,5 @@ -#ifndef _TY_COMMON_H__ -#define _TY_COMMON_H__ 1 +#ifndef TERMINOLOGY_TY_COMMON_H_ +#define TERMINOLOGY_TY_COMMON_H_ 1 int expect_running_in_terminology(void); ssize_t ty_write(int fd, const void *buf, size_t count); diff --git a/src/bin/tytest.h b/src/bin/tytest.h index d2f6d7c..0996ef9 100644 --- a/src/bin/tytest.h +++ b/src/bin/tytest.h @@ -1,5 +1,5 @@ -#ifndef _TYTEST_H__ -#define _TYTEST_H__ 1 +#ifndef TERMINOLOGY_TYTEST_H_ +#define TERMINOLOGY_TYTEST_H_ 1 #if defined(BINARY_TYTEST) #define evas_object_textgrid_palette_get test_textgrid_palette_get diff --git a/src/bin/tytest_common.h b/src/bin/tytest_common.h index 5db98f6..ca3a129 100644 --- a/src/bin/tytest_common.h +++ b/src/bin/tytest_common.h @@ -1,5 +1,5 @@ -#ifndef _TYTEST_COMMON_H__ -#define _TYTEST_COMMON_H__ 1 +#ifndef TERMINOLOGY_TYTEST_COMMON_H_ +#define TERMINOLOGY_TYTEST_COMMON_H_ 1 #define TY_H 24 #define TY_W 80 diff --git a/src/bin/unit_tests.h b/src/bin/unit_tests.h index 78ca212..543ee8c 100644 --- a/src/bin/unit_tests.h +++ b/src/bin/unit_tests.h @@ -1,5 +1,5 @@ -#ifndef _TY_UNIT_TESTS_H__ -#define _TY_UNIT_TESTS_H__ 1 +#ifndef TERMINOLOGY_TY_UNIT_TESTS_H_ +#define TERMINOLOGY_TY_UNIT_TESTS_H_ 1 /* Unit tests */ typedef int (*tytest_func)(void); diff --git a/src/bin/utf8.h b/src/bin/utf8.h index cc8b3fc..87b63b7 100644 --- a/src/bin/utf8.h +++ b/src/bin/utf8.h @@ -1,5 +1,5 @@ -#ifndef _UTF8_H__ -#define _UTF8_H__ 1 +#ifndef TERMINOLOGY_UTF8_H_ +#define TERMINOLOGY_UTF8_H_ 1 #include <Eina.h> int codepoint_to_utf8(Eina_Unicode g, char *txt); diff --git a/src/bin/utils.h b/src/bin/utils.h index 3706212..f905c48 100644 --- a/src/bin/utils.h +++ b/src/bin/utils.h @@ -1,5 +1,5 @@ -#ifndef _UTILS_H__ -#define _UTILS_H__ +#ifndef TERMINOLOGY_UTILS_H_ +#define TERMINOLOGY_UTILS_H_ #include <Eina.h> #include "config.h" diff --git a/src/bin/win.h b/src/bin/win.h index 804190b..13fd6c2 100644 --- a/src/bin/win.h +++ b/src/bin/win.h @@ -1,5 +1,5 @@ -#ifndef _WIN_H__ -#define _WIN_H__ 1 +#ifndef TERMINOLOGY_WIN_H_ +#define TERMINOLOGY_WIN_H_ 1 #include "config.h" diff --git a/tools/unicode_dbl_width.py b/tools/unicode_dbl_width.py index 533f127..6c5cf13 100755 --- a/tools/unicode_dbl_width.py +++ b/tools/unicode_dbl_width.py @@ -72,8 +72,8 @@ def skip_ranges(ranges, width_skipped): def gen_header(cur_range, file_header): file_header.write( """/* XXX: Code generated by tool unicode_dbl_width.py */ -#ifndef _TERMPTY_DBL_H__ -#define _TERMPTY_DBL_H__ 1 +#ifndef TERMINOLOGY_TERMPTY_DBL_H_ +#define TERMINOLOGY_TERMPTY_DBL_H_ 1 Eina_Bool _termpty_is_wide(const Eina_Unicode g); Eina_Bool _termpty_is_ambigous_wide(const Eina_Unicode g); --
