diff --git a/cmd/commonflags/commonflags.go b/cmd/commonflags/commonflags.go index b374e5c4..aa75d3d0 100644 --- a/cmd/commonflags/commonflags.go +++ b/cmd/commonflags/commonflags.go @@ -23,8 +23,8 @@ import ( ) const ( - CcompilersDefault = "clang,gcc" - CcompilersUsage = `comma-separated list of C compilers, e.g. "clang,gcc"` + CcompilersDefault = "clang-5.0,gcc" + CcompilersUsage = `comma-separated list of C compilers, e.g. "clang-5.0,gcc"` FocusDefault = "" FocusUsage = `comma-separated list of tests or benchmarks (name prefixes) to focus on, e.g. "wuffs_gif_decode"` diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 36a26bf6..4c0e6aae 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -74,7 +74,7 @@ func Do(args []string) error { return nil, err } stdout := &bytes.Buffer{} - cmd := exec.Command("clang-format", "-style=Chromium") + cmd := exec.Command("clang-format-5.0", "-style=Chromium") cmd.Stdin = bytes.NewReader(unformatted) cmd.Stdout = stdout cmd.Stderr = os.Stderr diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index dc5f8803..a9392a38 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -177,7 +177,7 @@ static inline void wuffs_base__image_config__initialize( #endif // WUFFS_BASE_HEADER_H -// ---------------- Use Declarations + // ---------------- Use Declarations #ifdef __cplusplus extern "C" { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 1986b4d6..66e8cda8 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -177,7 +177,7 @@ static inline void wuffs_base__image_config__initialize( #endif // WUFFS_BASE_HEADER_H -// ---------------- Use Declarations + // ---------------- Use Declarations #ifdef __cplusplus extern "C" { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 837e41a1..52111e1b 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -177,16 +177,16 @@ static inline void wuffs_base__image_config__initialize( #endif // WUFFS_BASE_HEADER_H -// ---------------- Use Declarations + // ---------------- Use Declarations -// ---------------- BEGIN USE "std/deflate" + // ---------------- BEGIN USE "std/deflate" #ifndef WUFFS_DEFLATE_H #define WUFFS_DEFLATE_H -// Code generated by wuffs-c. DO NOT EDIT. + // Code generated by wuffs-c. DO NOT EDIT. -// ---------------- Use Declarations + // ---------------- Use Declarations #ifdef __cplusplus extern "C" { diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index e29fb436..33fd98bd 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -177,7 +177,7 @@ static inline void wuffs_base__image_config__initialize( #endif // WUFFS_BASE_HEADER_H -// ---------------- Use Declarations + // ---------------- Use Declarations #ifdef __cplusplus extern "C" { diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index fead5f41..8585ad2d 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -177,7 +177,7 @@ static inline void wuffs_base__image_config__initialize( #endif // WUFFS_BASE_HEADER_H -// ---------------- Use Declarations + // ---------------- Use Declarations #ifdef __cplusplus extern "C" { diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 322fbdc1..377c53b3 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -177,16 +177,16 @@ static inline void wuffs_base__image_config__initialize( #endif // WUFFS_BASE_HEADER_H -// ---------------- Use Declarations + // ---------------- Use Declarations -// ---------------- BEGIN USE "std/deflate" + // ---------------- BEGIN USE "std/deflate" #ifndef WUFFS_DEFLATE_H #define WUFFS_DEFLATE_H -// Code generated by wuffs-c. DO NOT EDIT. + // Code generated by wuffs-c. DO NOT EDIT. -// ---------------- Use Declarations + // ---------------- Use Declarations #ifdef __cplusplus extern "C" {