From f987546a7417890843a0bfc102678740f21f41f5 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sat, 1 Oct 2016 14:43:52 +0200 Subject: [PATCH] Replaced "HAVE_HWMON" with "WITH_HWMON" as a more cmakish variable name for compile-time feature --- src/Makefile | 6 +++--- src/user_options.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 6876978d0..864eba044 100644 --- a/src/Makefile +++ b/src/Makefile @@ -123,7 +123,7 @@ CFLAGS_NATIVE += -s endif CFLAGS_NATIVE += $(CFLAGS) LFLAGS_NATIVE := -lpthread -ldl -CFLAGS_NATIVE += -DHAVE_HWMON +CFLAGS_NATIVE += -DWITH_HWMON LFLAGS_NATIVE += $(LDFLAGS) endif # linux @@ -143,7 +143,7 @@ ifndef DEBUG CFLAGS_CROSS_LINUX += -s endif CFLAGS_CROSS_LINUX += $(CFLAGS) -CFLAGS_CROSS_LINUX += -DHAVE_HWMON +CFLAGS_CROSS_LINUX += -DWITH_HWMON #CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1 CFLAGS_CROSS_WIN := @@ -151,7 +151,7 @@ ifndef DEBUG CFLAGS_CROSS_WIN += -s endif CFLAGS_CROSS_WIN += $(filter-out -fsanitize=address,$(CFLAGS)) -CFLAGS_CROSS_WIN += -DHAVE_HWMON +CFLAGS_CROSS_WIN += -DWITH_HWMON CFLAGS_CROSS_32 := -m32 CFLAGS_CROSS_64 := -m64 diff --git a/src/user_options.c b/src/user_options.c index b66ae4ce8..27135c53a 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -320,12 +320,12 @@ int user_options_parse (user_options_t *user_options, int argc, char **argv) return -1; } - #if !defined (HAVE_HWMON) + #if !defined (WITH_HWMON) user_options->powertune_enable = false; user_options->gpu_temp_disable = true; user_options->gpu_temp_abort = 0; user_options->gpu_temp_retain = 0; - #endif // HAVE_HWMON + #endif // WITH_HWMON // some options can influence or overwrite other options