diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:32:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:32:39 -0500 |
| commit | e45810113b150533611c7d9cb5f0f264e00a7394 (patch) | |
| tree | 771581e87e36d6e4a4c81019c61b0dcb444c5096 /src/lib/meminfo | |
| parent | a48cb9fa436720c263dd41ce501076185aeb5872 (diff) | |
| parent | 8b2041c343098052dcec03cd6eda7087bc5c7616 (diff) | |
| download | tor-e45810113b150533611c7d9cb5f0f264e00a7394.tar.gz tor-e45810113b150533611c7d9cb5f0f264e00a7394.zip | |
Merge branch 'pre_formatter_cleanups_squashed'
Diffstat (limited to 'src/lib/meminfo')
| -rw-r--r-- | src/lib/meminfo/meminfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index c01fa33f29..0c5e0ed665 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -37,7 +37,7 @@ #include <sys/sysctl.h> #endif -DISABLE_GCC_WARNING(aggregate-return) +DISABLE_GCC_WARNING("-Waggregate-return") /** Call the platform malloc info function, and dump the results to the log at * level <b>severity</b>. If no such function exists, do nothing. */ void @@ -58,7 +58,7 @@ tor_log_mallinfo(int severity) (void)severity; #endif /* defined(HAVE_MALLINFO) */ } -ENABLE_GCC_WARNING(aggregate-return) +ENABLE_GCC_WARNING("-Waggregate-return") #if defined(HW_PHYSMEM64) /* OpenBSD and NetBSD define this */ |