diff options
| author | Sven Gothel <[email protected]> | 2023-05-03 16:17:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-05-03 16:17:49 +0200 |
| commit | ec167fd05661a5b02dd406c87081f84a0f8dd77d (patch) | |
| tree | 9c4669e471c9969bda59265381b18d2d416db060 /common/pragmadefs.h | |
| parent | 0d14d30808cfe7b9e3413353e3eef8a0f201399a (diff) | |
| parent | d3875f333fb6abe2f39d82caca329414871ae53b (diff) | |
Merge branch 'v1.23.1'
Resolved Conflicts:
CMakeLists.txt
Diffstat (limited to 'common/pragmadefs.h')
| -rw-r--r-- | common/pragmadefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/pragmadefs.h b/common/pragmadefs.h index 1d0af066..9f0a711f 100644 --- a/common/pragmadefs.h +++ b/common/pragmadefs.h @@ -9,7 +9,7 @@ #else #if defined(__GNUC__) || defined(__clang__) #define DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") -#define DIAGNOSTIC_POP _Pragma("GCC diagnostic push") +#define DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") #else #define DIAGNOSTIC_PUSH #define DIAGNOSTIC_POP |