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

[ib]

Author: ib
Date: Fri Feb  5 11:16:14 2016
New Revision: 37616

Log:
Reapply r37260 (which has been reverted in r37343).

Uncrustify 0.62 is finally capable of suppressing the nl_after_func_*
newlines if an #endif follows.

Thus update required version of uncrustify to 0.62 (although no option
newer than 0.57 appears).

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

Modified: trunk/TOOLS/mp-uncrustify-style.cfg
==============================================================================
--- trunk/TOOLS/mp-uncrustify-style.cfg	Thu Feb  4 21:19:42 2016	(r37615)
+++ trunk/TOOLS/mp-uncrustify-style.cfg	Fri Feb  5 11:16:14 2016	(r37616)
@@ -1,4 +1,4 @@
-# Uncrustify >= 0.57
+# Uncrustify >= 0.62
 
 ### MPlayer coding style
 
@@ -6,20 +6,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)
 ######
 
 #
@@ -272,6 +258,9 @@ nl_after_semicolon
 # These occur in un-braced if/while/do/for statement bodies.
 nl_after_vbrace_open                      = true     # false/true
 
+# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'. Does not affect the whole-file #ifdef.
+nl_squeeze_ifdef                          = true     # false/true
+
 #
 # Blank line options
 #