comparison src/vim.h @ 11129:f4ea50924c6d v8.0.0452

patch 8.0.0452: some macros are in lower case commit https://github.com/vim/vim/commit/1c46544412382db8b3203d6c78e550df885540bd Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 12 20:10:05 2017 +0100 patch 8.0.0452: some macros are in lower case Problem: Some macros are in lower case. Solution: Make a few more macros upper case.
author Christian Brabandt <cb@256bit.org>
date Sun, 12 Mar 2017 20:15:06 +0100
parents 3b0924353019
children 501f46f7644c
comparison
equal deleted inserted replaced
11128:23154628ab7f 11129:f4ea50924c6d
586 * found or the +multilang feature is disabled. 586 * found or the +multilang feature is disabled.
587 */ 587 */
588 #ifdef FEAT_GETTEXT 588 #ifdef FEAT_GETTEXT
589 # ifdef DYNAMIC_GETTEXT 589 # ifdef DYNAMIC_GETTEXT
590 # define _(x) (*dyn_libintl_gettext)((char *)(x)) 590 # define _(x) (*dyn_libintl_gettext)((char *)(x))
591 # define ngettext(x, xs, n) (*dyn_libintl_ngettext)((char *)(x), (char *)(xs), (n)) 591 # define NGETTEXT(x, xs, n) (*dyn_libintl_ngettext)((char *)(x), (char *)(xs), (n))
592 # define N_(x) x 592 # define N_(x) x
593 # define bindtextdomain(domain, dir) (*dyn_libintl_bindtextdomain)((domain), (dir)) 593 # define bindtextdomain(domain, dir) (*dyn_libintl_bindtextdomain)((domain), (dir))
594 # define bind_textdomain_codeset(domain, codeset) (*dyn_libintl_bind_textdomain_codeset)((domain), (codeset)) 594 # define bind_textdomain_codeset(domain, codeset) (*dyn_libintl_bind_textdomain_codeset)((domain), (codeset))
595 # if !defined(HAVE_BIND_TEXTDOMAIN_CODESET) 595 # if !defined(HAVE_BIND_TEXTDOMAIN_CODESET)
596 # define HAVE_BIND_TEXTDOMAIN_CODESET 1 596 # define HAVE_BIND_TEXTDOMAIN_CODESET 1
599 # define libintl_putenv(envstring) (*dyn_libintl_putenv)(envstring) 599 # define libintl_putenv(envstring) (*dyn_libintl_putenv)(envstring)
600 # define libintl_wputenv(envstring) (*dyn_libintl_wputenv)(envstring) 600 # define libintl_wputenv(envstring) (*dyn_libintl_wputenv)(envstring)
601 # else 601 # else
602 # include <libintl.h> 602 # include <libintl.h>
603 # define _(x) gettext((char *)(x)) 603 # define _(x) gettext((char *)(x))
604 # define NGETTEXT(x, xs, n) ngettext((x), (xs), (n))
604 # ifdef gettext_noop 605 # ifdef gettext_noop
605 # define N_(x) gettext_noop(x) 606 # define N_(x) gettext_noop(x)
606 # else 607 # else
607 # define N_(x) x 608 # define N_(x) x
608 # endif 609 # endif
609 # endif 610 # endif
610 #else 611 #else
611 # define _(x) ((char *)(x)) 612 # define _(x) ((char *)(x))
612 # define ngettext(x, xs, n) (((n) == 1) ? (char *)(x) : (char *)(xs)) 613 # define NGETTEXT(x, xs, n) (((n) == 1) ? (char *)(x) : (char *)(xs))
613 # define N_(x) x 614 # define N_(x) x
614 # ifdef bindtextdomain 615 # ifdef bindtextdomain
615 # undef bindtextdomain 616 # undef bindtextdomain
616 # endif 617 # endif
617 # define bindtextdomain(x, y) /* empty */ 618 # define bindtextdomain(x, y) /* empty */
1762 */ 1763 */
1763 #define hl_attr(n) highlight_attr[(int)(n)] 1764 #define hl_attr(n) highlight_attr[(int)(n)]
1764 #define term_str(n) term_strings[(int)(n)] 1765 #define term_str(n) term_strings[(int)(n)]
1765 1766
1766 /* 1767 /*
1767 * vim_iswhite() is used for "^" and the like. It differs from isspace()
1768 * because it doesn't include <CR> and <LF> and the like.
1769 */
1770 #define vim_iswhite(x) ((x) == ' ' || (x) == '\t')
1771
1772 /*
1773 * EXTERN is only defined in main.c. That's where global variables are 1768 * EXTERN is only defined in main.c. That's where global variables are
1774 * actually defined and initialized. 1769 * actually defined and initialized.
1775 */ 1770 */
1776 #ifndef EXTERN 1771 #ifndef EXTERN
1777 # define EXTERN extern 1772 # define EXTERN extern