Perhaps squash these two while queuing to address comments from you two?

Thanks.

 Documentation/CodingGuidelines |  3 ++-
 Makefile                       | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1c676c2..0ddd368 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -173,7 +173,8 @@ For C programs:
 
  - As a Git developer we assume you have a reasonably modern compiler
    and we recommend you to enable the DEVELOPER makefile knob to
-   ensure your patch is clear of all compiler warnings we care about.
+   ensure your patch is clear of all compiler warnings we care about,
+   by e.g. "echo DEVELOPER=1 >>config.mak".
 
  - We try to support a wide range of C compilers to compile Git with,
    including old ones. That means that you should not use C99
diff --git a/Makefile b/Makefile
index 9eb4032..7dc5b88 100644
--- a/Makefile
+++ b/Makefile
@@ -381,15 +381,15 @@ ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
 
 ifdef DEVELOPER
-       CFLAGS +=       -Werror \
-                               -Wdeclaration-after-statement \
-                               -Wno-format-zero-length \
-                               -Wold-style-definition \
-                               -Woverflow \
-                               -Wpointer-arith \
-                               -Wstrict-prototypes \
-                               -Wunused \
-                               -Wvla
+CFLAGS += -Werror \
+       -Wdeclaration-after-statement \
+       -Wno-format-zero-length \
+       -Wold-style-definition \
+       -Woverflow \
+       -Wpointer-arith \
+       -Wstrict-prototypes \
+       -Wunused \
+       -Wvla
 endif
 
 # Create as necessary, replace existing, make ranlib unneeded.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to