Merge pull request 'Fix macro definition interfering with -Wmisleading-indentation' (#241 ) from dcbaker/pkgconf:submit/misleading-indentation into master

Reviewed-on: #241
meson: add -Wmisleading-indentation
2022-08-04 04:33:11 +00:00 · 2022-08-03 12:03:15 -07:00 · 2022-08-03 12:03:15 -07:00
2 changed files with 3 additions and 2 deletions
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@ -298,11 +298,11 @@ PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_cl
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
 #define PKGCONF_TRACE(client, ...) do { \
 		pkgconf_trace(client, __FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__); \
-	} while (0);
+	} while (0)
 #else
 #define PKGCONF_TRACE(client, ...) do { \
 		pkgconf_trace(client, __FILE__, __LINE__, __func__, __VA_ARGS__); \
-	} while (0);
+	} while (0)
 #endif
 #else
 #define PKGCONF_TRACE(client, ...)
--- a/meson.build
+++ b/meson.build
@ -12,6 +12,7 @@ add_project_arguments(
  '-D_DEFAULT_SOURCE',
  cc.get_supported_arguments(
    '-Wimplicit-function-declaration',
+    '-Wmisleading-indentation',
  ),
  language : 'c',
 )
Author	SHA1	Message	Date
Ariadne Conill	d240afe7d9	Merge pull request 'Fix macro definition interfering with -Wmisleading-indentation' (#241 ) from dcbaker/pkgconf:submit/misleading-indentation into master ci/woodpecker/push/woodpecker Pipeline was successful Details Reviewed-on: #241	2022-08-04 04:33:11 +00:00
Dylan Baker	125a13d3b9	meson: add -Wmisleading-indentation ci/woodpecker/pr/woodpecker Pipeline was successful Details A useful warning when loop and conditional statements are allowed without braces.	2022-08-03 12:03:15 -07:00
Dylan Baker	96c61cbab0	libpkgconf: remove trailing ; from macro definition GCC has a lovely bug (which I will report as soon as I have an account), which causes -Wmisleading-indentation to miss cases of misleading indentation after a `;;`, since the macro adds `;`, and in call cases the caller also adds `;`, we end up with a double macro and gcc fails to warn.	2022-08-03 12:03:15 -07:00