[src/trunk]: src/external/mit/xorg/lib Before testing the value of HAVE_GCC, ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8cbaed1e328e
branches:  trunk
changeset: 790598:8cbaed1e328e
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Oct 18 01:12:00 2013 +0000

description:
Before testing the value of HAVE_GCC, test if it's defined.

diffstat:

 external/mit/xorg/lib/libX11/Makefile.libx11 |  4 ++--
 external/mit/xorg/lib/libXi/Makefile         |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r c4040167a34f -r 8cbaed1e328e external/mit/xorg/lib/libX11/Makefile.libx11
--- a/external/mit/xorg/lib/libX11/Makefile.libx11      Fri Oct 18 00:03:35 2013 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11      Fri Oct 18 01:12:00 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libx11,v 1.11 2013/06/03 23:01:12 christos Exp $
+#      $NetBSD: Makefile.libx11,v 1.12 2013/10/18 01:12:00 riz Exp $
 
 LIB=   X11
 .PATH: ${X11SRCDIR.${LIB}}/src
@@ -462,7 +462,7 @@
 COPTS.OpenDis.c+=      -Wno-error      # XXX xf86bigfstr.h
 COPTS.XlibInt.c+=      -Wno-error      # XXX xcmiscstr.h
 COPTS.XKBBind.c+=      -Wno-error      # uses XKeycodeToKeysym
-.if ${HAVE_GCC} < 45
+.if defined(HAVE_GCC) &&  ${HAVE_GCC} < 45
 COPTS.LiHosts.c+=      -Wno-error      # XXX: old gcc figures out that const
                                        # cond because nHosts < max_hosts
 .endif
diff -r c4040167a34f -r 8cbaed1e328e external/mit/xorg/lib/libXi/Makefile
--- a/external/mit/xorg/lib/libXi/Makefile      Fri Oct 18 00:03:35 2013 +0000
+++ b/external/mit/xorg/lib/libXi/Makefile      Fri Oct 18 01:12:00 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2013/06/06 21:42:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2013/10/18 01:12:00 riz Exp $
 
 .include <bsd.own.mk>
 
@@ -80,7 +80,7 @@
 COPTS.XExtInt.c+=      -Wno-error      # XXX
 COPTS.XSndExEv.c+=     -Wno-error      # XXX
 
-.if ${HAVE_GCC} < 45
+.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
 COPTS.XGetFCtl.c+=     -Wno-error      # XXX
 .endif