freetype-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][master] 2 commits: * src/*: Replace leading und

From: Werner Lemberg (@wl)
Subject: [Git][freetype/freetype][master] 2 commits: * src/*: Replace leading underscores with trailing ones in dummy variables.
Date: Sun, 26 Feb 2023 20:05:52 +0000

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

  • d399657f
    by Werner Lemberg at 2023-02-26T20:18:54+01:00 
    * src/*: Replace leading underscores with trailing ones in dummy variables.

This is to avoid clang warnings.
  • 2257f9ab
    by Werner Lemberg at 2023-02-26T20:23:43+01:00 
    * include/freetype/internal/compiler-macros.h (FALL_THROUGH): Update.

This follows

  https://lists.gnu.org/archive/html/bug-gnulib/2023-02/msg00159.html

20 changed files:

Changes:

  • include/freetype/internal/compiler-macros.h
    ... ... @@ -41,8 +41,11 @@ FT_BEGIN_HEADER
    41 41 
     #  if ( defined( __STDC_VERSION__ ) && __STDC_VERSION__ > 201710L ) || \
    42 42 
           ( defined( __cplusplus ) && __cplusplus > 201402L )
    43 43 
     #    define FALL_THROUGH  [[__fallthrough__]]
    44 
    -#  elif ( defined( __GNUC__ ) && __GNUC__ >= 7 )          || \
    45 
    -        ( defined( __clang__ ) && __clang_major__ >= 10 )
    44 
    +#  elif ( defined( __GNUC__ ) && __GNUC__ >= 7 )       || \
    45 
    +        ( defined( __clang__ )                      &&    \
    46 
    +          ( defined( __apple_build_version__ )            \
    47 
    +              ? __apple_build_version__ >= 14000000       \
    48 
    +              : __clang_major__ >= 10 ) )
    46 49 
     #    define FALL_THROUGH  __attribute__(( __fallthrough__ ))
    47 50 
     #  else
    48 51 
     #    define FALL_THROUGH  ( (void)0 )

  • src/autofit/ft-hb.c
    ... ... @@ -108,7 +108,7 @@ hb_ft_font_create_ (FT_Face ft_face,
    108 108 
     #else /* !FT_CONFIG_OPTION_USE_HARFBUZZ */
    109 109
    110 110 
     /* ANSI C doesn't like empty source files */
    111 
    -typedef int  _ft_hb_dummy;
    111 
    +typedef int  ft_hb_dummy_;
    112 112
    113 113 
     #endif /* !FT_CONFIG_OPTION_USE_HARFBUZZ */
    114 114

  • src/base/ftdbgmem.c
    ... ... @@ -963,7 +963,7 @@
    963 963 
     #else  /* !FT_DEBUG_MEMORY */
    964 964
    965 965 
       /* ANSI C doesn't like empty source files */
    966 
    -  typedef int  _debug_mem_dummy;
    966 
    +  typedef int  debug_mem_dummy_;
    967 967
    968 968 
     #endif /* !FT_DEBUG_MEMORY */
    969 969

  • src/base/ftmac.c
    ... ... @@ -1082,7 +1082,7 @@
    1082 1082 
     #else /* !FT_MACINTOSH */
    1083 1083
    1084 1084 
       /* ANSI C doesn't like empty source files */
    1085 
    -  typedef int  _ft_mac_dummy;
    1085 
    +  typedef int  ft_mac_dummy_;
    1086 1086
    1087 1087 
     #endif /* !FT_MACINTOSH */
    1088 1088

  • src/dlg/dlgwrap.c
    ... ... @@ -25,7 +25,7 @@
    25 25 
     #include "dlg.c"
    26 26 
     #else
    27 27 
       /* ANSI C doesn't like empty source files */
    28 
    -  typedef int  _dlg_dummy;
    28 
    +  typedef int  dlg_dummy_;
    29 29 
     #endif
    30 30
    31 31

  • src/psaux/afmparse.c
    ... ... @@ -1086,7 +1086,7 @@
    1086 1086 
     #else /* T1_CONFIG_OPTION_NO_AFM */
    1087 1087
    1088 1088 
       /* ANSI C doesn't like empty source files */
    1089 
    -  typedef int  _afm_parse_dummy;
    1089 
    +  typedef int  afm_parse_dummy_;
    1090 1090
    1091 1091 
     #endif /* T1_CONFIG_OPTION_NO_AFM */
    1092 1092

  • src/sfnt/pngshim.c
    ... ... @@ -457,7 +457,7 @@
    457 457 
     #else /* !(TT_CONFIG_OPTION_EMBEDDED_BITMAPS && FT_CONFIG_OPTION_USE_PNG) */
    458 458
    459 459 
       /* ANSI C doesn't like empty source files */
    460 
    -  typedef int  _pngshim_dummy;
    460 
    +  typedef int  pngshim_dummy_;
    461 461
    462 462 
     #endif /* !(TT_CONFIG_OPTION_EMBEDDED_BITMAPS && FT_CONFIG_OPTION_USE_PNG) */
    463 463

  • src/sfnt/sfwoff.c
    ... ... @@ -426,7 +426,7 @@
    426 426 
     #else /* !FT_CONFIG_OPTION_USE_ZLIB */
    427 427
    428 428 
       /* ANSI C doesn't like empty source files */
    429 
    -  typedef int  _sfwoff_dummy;
    429 
    +  typedef int  sfwoff_dummy_;
    430 430
    431 431 
     #endif /* !FT_CONFIG_OPTION_USE_ZLIB */
    432 432

  • src/sfnt/sfwoff2.c
    ... ... @@ -2378,7 +2378,7 @@
    2378 2378 
     #else /* !FT_CONFIG_OPTION_USE_BROTLI */
    2379 2379
    2380 2380 
       /* ANSI C doesn't like empty source files */
    2381 
    -  typedef int  _sfwoff2_dummy;
    2381 
    +  typedef int  sfwoff2_dummy_;
    2382 2382
    2383 2383 
     #endif /* !FT_CONFIG_OPTION_USE_BROTLI */
    2384 2384

  • src/sfnt/ttbdf.c
    ... ... @@ -248,7 +248,7 @@
    248 248 
     #else /* !TT_CONFIG_OPTION_BDF */
    249 249
    250 250 
       /* ANSI C doesn't like empty source files */
    251 
    -  typedef int  _tt_bdf_dummy;
    251 
    +  typedef int  tt_bdf_dummy_;
    252 252
    253 253 
     #endif /* !TT_CONFIG_OPTION_BDF */
    254 254

  • src/sfnt/ttcolr.c
    ... ... @@ -1914,7 +1914,7 @@
    1914 1914 
     #else /* !TT_CONFIG_OPTION_COLOR_LAYERS */
    1915 1915
    1916 1916 
       /* ANSI C doesn't like empty source files */
    1917 
    -  typedef int  _tt_colr_dummy;
    1917 
    +  typedef int  tt_colr_dummy_;
    1918 1918
    1919 1919 
     #endif /* !TT_CONFIG_OPTION_COLOR_LAYERS */
    1920 1920

  • src/sfnt/ttcpal.c
    ... ... @@ -303,7 +303,7 @@
    303 303 
     #else /* !TT_CONFIG_OPTION_COLOR_LAYERS */
    304 304
    305 305 
       /* ANSI C doesn't like empty source files */
    306 
    -  typedef int  _tt_cpal_dummy;
    306 
    +  typedef int  tt_cpal_dummy_;
    307 307
    308 308 
     #endif /* !TT_CONFIG_OPTION_COLOR_LAYERS */
    309 309

  • src/sfnt/ttpost.c
    ... ... @@ -558,7 +558,7 @@
    558 558 
     #else /* !TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
    559 559
    560 560 
       /* ANSI C doesn't like empty source files */
    561 
    -  typedef int  _tt_post_dummy;
    561 
    +  typedef int  tt_post_dummy_;
    562 562
    563 563 
     #endif /* !TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
    564 564

  • src/sfnt/ttsbit.c
    ... ... @@ -1677,7 +1677,7 @@
    1677 1677 
     #else /* !TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
    1678 1678
    1679 1679 
       /* ANSI C doesn't like empty source files */
    1680 
    -  typedef int  _tt_sbit_dummy;
    1680 
    +  typedef int  tt_sbit_dummy_;
    1681 1681
    1682 1682 
     #endif /* !TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
    1683 1683

  • src/sfnt/ttsvg.c
    ... ... @@ -405,7 +405,7 @@
    405 405 
     #else /* !FT_CONFIG_OPTION_SVG */
    406 406
    407 407 
       /* ANSI C doesn't like empty source files */
    408 
    -  typedef int  _tt_svg_dummy;
    408 
    +  typedef int  tt_svg_dummy_;
    409 409
    410 410 
     #endif /* !FT_CONFIG_OPTION_SVG */
    411 411

  • src/sfnt/woff2tags.c
    ... ... @@ -111,7 +111,7 @@
    111 111 
     #else /* !FT_CONFIG_OPTION_USE_BROTLI */
    112 112
    113 113 
       /* ANSI C doesn't like empty source files */
    114 
    -  typedef int  _woff2tags_dummy;
    114 
    +  typedef int  woff2tags_dummy_;
    115 115
    116 116 
     #endif /* !FT_CONFIG_OPTION_USE_BROTLI */
    117 117

  • src/truetype/ttgxvar.c
    ... ... @@ -4565,7 +4565,7 @@
    4565 4565 
     #else /* !TT_CONFIG_OPTION_GX_VAR_SUPPORT */
    4566 4566
    4567 4567 
       /* ANSI C doesn't like empty source files */
    4568 
    -  typedef int  _tt_gxvar_dummy;
    4568 
    +  typedef int  tt_gxvar_dummy_;
    4569 4569
    4570 4570 
     #endif /* !TT_CONFIG_OPTION_GX_VAR_SUPPORT */
    4571 4571

  • src/truetype/ttinterp.c
    ... ... @@ -8604,7 +8604,7 @@
    8604 8604 
     #else /* !TT_USE_BYTECODE_INTERPRETER */
    8605 8605
    8606 8606 
       /* ANSI C doesn't like empty source files */
    8607 
    -  typedef int  _tt_interp_dummy;
    8607 
    +  typedef int  tt_interp_dummy_;
    8608 8608
    8609 8609 
     #endif /* !TT_USE_BYTECODE_INTERPRETER */
    8610 8610

  • src/truetype/ttsubpix.c
    ... ... @@ -1004,7 +1004,7 @@
    1004 1004 
           /*   TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY) */
    1005 1005
    1006 1006 
       /* ANSI C doesn't like empty source files */
    1007 
    -  typedef int  _tt_subpix_dummy;
    1007 
    +  typedef int  tt_subpix_dummy_;
    1008 1008
    1009 1009 
     #endif /* !(TT_USE_BYTECODE_INTERPRETER &&          */
    1010 1010 
            /*   TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY) */

  • src/type1/t1afm.c
    ... ... @@ -405,7 +405,7 @@
    405 405 
     #else /* T1_CONFIG_OPTION_NO_AFM */
    406 406
    407 407 
       /* ANSI C doesn't like empty source files */
    408 
    -  typedef int  _t1_afm_dummy;
    408 
    +  typedef int  t1_afm_dummy_;
    409 409
    410 410 
     #endif /* T1_CONFIG_OPTION_NO_AFM */
    411 411

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help

    reply via email to
    [Prev in Thread] Current Thread [Next in Thread]