[MPlayer-cvslog] r37343 - trunk/TOOLS/mp-uncrustify-style.cfg

[ib]

Author: ib
Date: Tue Dec 23 14:24:33 2014
New Revision: 37343

Log:
Revert r37260.

There currently (as of uncrustify v0.61) seems to be no way to suppress
the nl_after_func_* newlines if an #else or #endif follows.

Setting nl_squeeze_ifdef to true would result in losing the usual
newline before the closing #endif in a header file, so reset it.

Modified:
   trunk/TOOLS/mp-uncrustify-style.cfg

Modified: trunk/TOOLS/mp-uncrustify-style.cfg
==============================================================================
--- trunk/TOOLS/mp-uncrustify-style.cfg	Fri Dec 19 12:07:43 2014	(r37342)
+++ trunk/TOOLS/mp-uncrustify-style.cfg	Tue Dec 23 14:24:33 2014	(r37343)
@@ -5,6 +5,21 @@
 ###
 ### - 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
@@ -998,7 +1013,7 @@ nl_after_vbrace_close                   
 nl_define_macro                          = false    # false/true
 
 # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'
-nl_squeeze_ifdef                         = true     # false/true
+nl_squeeze_ifdef                         = false    # false/true
 
 # Add or remove blank line before 'if'
 nl_before_if                             = ignore   # ignore/add/remove/force