Author: ib Date: Sun Aug 31 00:06:22 2014 New Revision: 37260 Log: Fix issue with blank line after each function and #ifdef. Setting nl_squeeze_ifdef suppresses the blank line as desired. Modified: trunk/TOOLS/mp-uncrustify-style.cfg Modified: trunk/TOOLS/mp-uncrustify-style.cfg ============================================================================== --- trunk/TOOLS/mp-uncrustify-style.cfg Thu Aug 28 21:34:05 2014 (r37259) +++ trunk/TOOLS/mp-uncrustify-style.cfg Sun Aug 31 00:06:22 2014 (r37260) @@ -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_after_vbrace_close 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