Mercurial > mplayer.hg

changeset 37164:22355747d51f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue with blank line after each function and #ifdef. Setting nl_squeeze_ifdef suppresses the blank line as desired.
author ib
date Sat, 30 Aug 2014 22:06:22 +0000
parents caea6b4337d8
children 681c7f805a23
files TOOLS/mp-uncrustify-style.cfg
diffstat 1 files changed, 1 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/TOOLS/mp-uncrustify-style.cfg	Thu Aug 28 19:34:05 2014 +0000
+++ b/TOOLS/mp-uncrustify-style.cfg	Sat Aug 30 22:06:22 2014 +0000
@@ -5,21 +5,6 @@
 ###
 ### - Align comments?
 ###
-### - New line after function
-###
-###   nl_after_func_body force one blank line after each function, but it should
-###   not when surrounded with #ifdef:
-###
-###       #ifdef CONFIG_DVDNAV
-###       static void mp_dvdnav_context_free(MPContext *ctx)
-###       {
-###           // [...]
-###       }
-###
-###       #endif
-###
-###       void uninit_player(unsigned int mask)
-###
 
 #
 # General options
@@ -1013,7 +998,7 @@
 nl_define_macro                          = false    # false/true
 
 # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'
-nl_squeeze_ifdef                         = false    # false/true
+nl_squeeze_ifdef                         = true     # false/true
 
 # Add or remove blank line before 'if'
 nl_before_if                             = ignore   # ignore/add/remove/force