From 9aa094d1b1184026fa0e18a8967c32baa1a5922e Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 31 Mar 2022 15:32:36 +0800 Subject: [PATCH] misc: Replace `#ifdef\t__cplusplus` with `#ifdef\s\s__cplusplus` Signed-off-by: Yonggang Luo Part-of: --- src/gallium/auxiliary/cso_cache/cso_cache.h | 4 ++-- src/gallium/auxiliary/cso_cache/cso_context.h | 4 ++-- src/gallium/auxiliary/cso_cache/cso_hash.h | 4 ++-- src/gallium/auxiliary/os/os_mman.h | 2 +- src/gallium/auxiliary/util/u_dl.h | 4 ++-- src/gallium/auxiliary/util/u_dump.h | 4 ++-- src/gallium/auxiliary/util/u_file.h | 4 ++-- src/util/os_misc.h | 2 +- src/util/u_cpu_detect.h | 4 ++-- src/util/u_debug.h | 4 ++-- src/util/u_debug_stack.h | 4 ++-- src/util/u_debug_symbol.h | 4 ++-- src/util/u_perfetto.h | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h index 745db51f0d6..3e9b05ce21a 100644 --- a/src/gallium/auxiliary/cso_cache/cso_cache.h +++ b/src/gallium/auxiliary/cso_cache/cso_cache.h @@ -81,7 +81,7 @@ #include "cso_hash.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -182,7 +182,7 @@ cso_construct_key(void *key, int key_size) return hash; } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/gallium/auxiliary/cso_cache/cso_context.h b/src/gallium/auxiliary/cso_cache/cso_context.h index b153e8347fc..3c5b6064209 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.h +++ b/src/gallium/auxiliary/cso_cache/cso_context.h @@ -35,7 +35,7 @@ #include "cso_cache.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -216,7 +216,7 @@ cso_draw_arrays_instanced(struct cso_context *cso, uint mode, void cso_draw_arrays(struct cso_context *cso, uint mode, uint start, uint count); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h index 26ab7fc5a06..05bf757164c 100644 --- a/src/gallium/auxiliary/cso_cache/cso_hash.h +++ b/src/gallium/auxiliary/cso_cache/cso_hash.h @@ -46,7 +46,7 @@ #include "pipe/p_compiler.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -171,7 +171,7 @@ cso_hash_iter_next(struct cso_hash_iter iter) return next; } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/gallium/auxiliary/os/os_mman.h b/src/gallium/auxiliary/os/os_mman.h index c7ef9d02170..04b3e0a9f72 100644 --- a/src/gallium/auxiliary/os/os_mman.h +++ b/src/gallium/auxiliary/os/os_mman.h @@ -77,7 +77,7 @@ static inline int os_munmap(void *addr, size_t length) #endif -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/gallium/auxiliary/util/u_dl.h b/src/gallium/auxiliary/util/u_dl.h index d2f4737d42a..2f5c35167c0 100644 --- a/src/gallium/auxiliary/util/u_dl.h +++ b/src/gallium/auxiliary/util/u_dl.h @@ -32,7 +32,7 @@ #include "pipe/p_config.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -82,7 +82,7 @@ util_dl_close(struct util_dl_library *library); const char * util_dl_error(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/gallium/auxiliary/util/u_dump.h b/src/gallium/auxiliary/util/u_dump.h index dab2d19c15d..0469ea21f90 100644 --- a/src/gallium/auxiliary/util/u_dump.h +++ b/src/gallium/auxiliary/util/u_dump.h @@ -42,7 +42,7 @@ #include -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -226,7 +226,7 @@ util_dump_blit_info(FILE *stream, const struct pipe_blit_info *info); /* FIXME: Move the other debug_dump_xxx functions out of u_debug.h into here. */ -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/gallium/auxiliary/util/u_file.h b/src/gallium/auxiliary/util/u_file.h index f337dc9761e..dddfa1a8967 100644 --- a/src/gallium/auxiliary/util/u_file.h +++ b/src/gallium/auxiliary/util/u_file.h @@ -36,7 +36,7 @@ #include #endif -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -51,7 +51,7 @@ u_file_access(const char *path, int mode) { #endif } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/util/os_misc.h b/src/util/os_misc.h index 432bfe1abf5..d0c2243d1aa 100644 --- a/src/util/os_misc.h +++ b/src/util/os_misc.h @@ -108,7 +108,7 @@ bool os_get_page_size(uint64_t *size); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/util/u_cpu_detect.h b/src/util/u_cpu_detect.h index 8e35b3640a1..715d9cecf2e 100644 --- a/src/util/u_cpu_detect.h +++ b/src/util/u_cpu_detect.h @@ -42,7 +42,7 @@ #include "util/u_thread.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -170,7 +170,7 @@ util_get_cpu_caps(void) return &util_cpu_caps; } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/util/u_debug.h b/src/util/u_debug.h index 9c4a4cfd091..4986bee112b 100644 --- a/src/util/u_debug.h +++ b/src/util/u_debug.h @@ -54,7 +54,7 @@ #include #endif -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -531,7 +531,7 @@ debug_get_option_ ## sufix (void) \ } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/util/u_debug_stack.h b/src/util/u_debug_stack.h index dadd5426df6..e8177580dca 100644 --- a/src/util/u_debug_stack.h +++ b/src/util/u_debug_stack.h @@ -43,7 +43,7 @@ */ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -85,7 +85,7 @@ debug_backtrace_print(FILE *f, const struct debug_stack_frame *backtrace, unsigned nr_frames); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/util/u_debug_symbol.h b/src/util/u_debug_symbol.h index 11621c3b3dd..1ba41f42e01 100644 --- a/src/util/u_debug_symbol.h +++ b/src/util/u_debug_symbol.h @@ -37,7 +37,7 @@ */ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -51,7 +51,7 @@ debug_symbol_name_cached(const void *addr); void debug_symbol_print(const void *addr); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/util/u_perfetto.h b/src/util/u_perfetto.h index a7ff1ddc29e..a50f010b58f 100644 --- a/src/util/u_perfetto.h +++ b/src/util/u_perfetto.h @@ -25,13 +25,13 @@ #define _UTIL_PERFETTO_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif void util_perfetto_init(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif