diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-10-10 04:59:28 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-10-10 04:59:28 +0000 |
| commit | 20abfc36bec4de2ad9f2e4682be7f93f61f6419d (patch) | |
| tree | 6b66f0d2c2a79ad953d15be2c5d9994d693c0688 /tests | |
| parent | fd116ba4af8f0fbb4ade42d44a203e924b400d09 (diff) | |
| parent | b433d140c0be0ffbb5018dec3c3b502f9fe20884 (diff) | |
| download | gnutls-20abfc36bec4de2ad9f2e4682be7f93f61f6419d.tar.gz | |
Merge branch 'tmp-fix-eina-cpu-on-solaris' into 'master'
Fix check for GNU C compiler in eina_cpu.c
See merge request gnutls/gnutls!772
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/suite/ecore/src/lib/eina_cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/suite/ecore/src/lib/eina_cpu.c b/tests/suite/ecore/src/lib/eina_cpu.c index bb99f7d8e8..d50506a03e 100644 --- a/tests/suite/ecore/src/lib/eina_cpu.c +++ b/tests/suite/ecore/src/lib/eina_cpu.c @@ -24,7 +24,7 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> -#elif defined (__SUNPRO_C) || defined(__GNU__) +#elif defined (__SUNPRO_C) || defined(__GNUC__) #include <unistd.h> #elif defined (__FreeBSD__) || defined (__OpenBSD__) || \ defined (__NetBSD__) || defined (__DragonFly__) || defined (__MacOSX__) || \ @@ -86,7 +86,7 @@ EAPI int eina_cpu_count(void) GetSystemInfo(&sysinfo); return sysinfo.dwNumberOfProcessors; -#elif defined (__SUNPRO_C) || defined(__GNU__) +#elif defined (__SUNPRO_C) || defined(__GNUC__) /* * _SC_NPROCESSORS_ONLN: number of processors that are online, that is available when sysconf is called. The number |