[libvirt] [PATCH v2 1/5] Remove duplicate define of __GNUC_PREREQ
Back in this commit:
commit b436a8ae5ccb04f8cf893d882d52ab5efc713307
Author: Fabian Freyer <fabian.freyer(a)physik.tu-berlin.de>
Date: Thu Jun 9 00:50:35 2016 +0000
gnulib: add getopt module
config-post.h was modified to define __GNUC_PREREQ, but the
original definition was never removed from internal.h, and
that is now dead code since config.h is always the first file
included.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
config-post.h | 4 ++--
src/internal.h | 10 ----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/config-post.h b/config-post.h
index ffd0904..75e7d02 100644
--- a/config-post.h
+++ b/config-post.h
@@ -75,11 +75,11 @@
#endif /* LIBVIRT_NSS */
/*
- * Define __GNUC__ to a sane default if it isn't yet defined.
+ * Define __GNUC_PREREQ to a sane default if it isn't yet defined.
* This is done here so that it's included as early as possible; gnulib relies
* on this to be defined in features.h, which should be included from ctype.h.
* This doesn't happen on many non-glibc systems.
- * When __GNUC__ is not defined, gnulib defines it to 0, which breaks things.
+ * When __GNUC_PREREQ is not defined, gnulib defines it to 0, which breaks things.
*/
#ifdef __GNUC__
# ifndef __GNUC_PREREQ
diff --git a/src/internal.h b/src/internal.h
index 03a973c..2ab3d48 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -108,16 +108,6 @@
# ifdef __GNUC__
-# ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_MINOR__
-# define __GNUC_PREREQ(maj, min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-# define __GNUC_PREREQ(maj, min) 0
-# endif
-
-# endif /* __GNUC__ */
-
/**
* ATTRIBUTE_UNUSED:
*
--
2.9.4