aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
authorOrion Poplawski <orion@cora.nwra.com>2015-02-09 15:49:51 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:49:51 +0100
commit0b711de48cdb04f4328eff75f82b97f9a07cbfbf (patch)
tree02358431b67192acc8497d780ba478be657fad39 /nx-X11/lib
parent9ea734b21c6f5485b0db305fa04b023b513e2490 (diff)
downloadnx-libs-0b711de48cdb04f4328eff75f82b97f9a07cbfbf.tar.gz
nx-libs-0b711de48cdb04f4328eff75f82b97f9a07cbfbf.tar.bz2
nx-libs-0b711de48cdb04f4328eff75f82b97f9a07cbfbf.zip
Fix FTBFS on ppc64 architecture (054_nx-X11_ppc64-ftbfs.full.patch).
Diffstat (limited to 'nx-X11/lib')
-rw-r--r--nx-X11/lib/GL/mesa/main/Imakefile.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc
index 5deaf1038..80b3aef07 100644
--- a/nx-X11/lib/GL/mesa/main/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc
@@ -1,5 +1,8 @@
XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
+/* gcc on ppc64 defines this, causes macro recursion with pixel below */
+#undef pixel
+
#ifndef MesaBuildDir
#define MesaBuildDir $(GLXLIBSRC)/mesa/main/
#endif