diff options
| author | Alfredo Cardigliano <cardigliano@ntop.org> | 2022-09-13 10:41:44 +0200 |
|---|---|---|
| committer | Alfredo Cardigliano <cardigliano@ntop.org> | 2022-09-13 10:41:44 +0200 |
| commit | 973950d8812ba58d6c72ea58badbd62e5152ff07 (patch) | |
| tree | a2c7ee0beb774aeb71f01b24cf8e67839a06b001 | |
| parent | 4f584f78a0c11ebecfe999e6a728db24efda5e8b (diff) | |
Replace obsolete linux macro
| -rw-r--r-- | example/ndpiReader.c | 14 | ||||
| -rw-r--r-- | tests/unit/unit.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index cd8a48f66..f80bc479a 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -20,7 +20,7 @@ #include "ndpi_config.h" -#ifdef linux +#ifdef __linux__ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif @@ -105,7 +105,7 @@ static u_int16_t num_loops = 1; static u_int8_t shutdown_app = 0, quiet_mode = 0; static u_int8_t num_threads = 1; static struct timeval startup_time, begin, end; -#ifdef linux +#ifdef __linux__ static int core_affinity[MAX_NUM_READER_THREADS]; #endif static struct timeval pcap_start = { 0, 0}, pcap_end = { 0, 0 }; @@ -457,7 +457,7 @@ static void help(u_int long_help) { " -k <file> | Specify a file to write serialized detection results\n" " -K <format> | Specify the serialization format for `-k'\n" " | Valid formats are tlv, csv or json (default)\n" -#ifdef linux +#ifdef __linux__ " -g <id:id...> | Thread affinity mask (one core id per thread)\n" #endif " -a <mode> | Generates option values for GUIs\n" @@ -788,7 +788,7 @@ static void parseOptions(int argc, char **argv) { #ifndef USE_DPDK char *__pcap_file = NULL; int thread_id, do_capture = 0; -#ifdef linux +#ifdef __linux__ char *bind_mask = NULL; u_int num_cores = sysconf(_SC_NPROCESSORS_ONLN); #endif @@ -864,7 +864,7 @@ static void parseOptions(int argc, char **argv) { break; #ifndef USE_DPDK -#ifdef linux +#ifdef __linux__ case 'g': bind_mask = optarg; break; @@ -1105,7 +1105,7 @@ static void parseOptions(int argc, char **argv) { } } -#ifdef linux +#ifdef __linux__ #ifndef USE_DPDK for(thread_id = 0; thread_id < num_threads; thread_id++) core_affinity[thread_id] = -1; @@ -4041,7 +4041,7 @@ void * processing_thread(void *_thread_id) { char pcap_error_buffer[PCAP_ERRBUF_SIZE]; #endif -#if defined(linux) && defined(HAVE_PTHREAD_SETAFFINITY_NP) +#if defined(__linux__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) if(core_affinity[thread_id] >= 0) { cpu_set_t cpuset; diff --git a/tests/unit/unit.c b/tests/unit/unit.c index 9c115031d..5123155e0 100644 --- a/tests/unit/unit.c +++ b/tests/unit/unit.c @@ -18,7 +18,7 @@ * */ -#ifdef linux +#ifdef __linux__ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif |