summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2006-07-27 18:24:59 -0700
committerAaron Plattner <aplattner@nvidia.com>2006-07-27 18:24:59 -0700
commite6ae1612be519ee6224d354244d076d85d44a750 (patch)
tree216a981c989c600402b0a2dc5ba727eeaf574cd2
parent377a581ddf5e428a368efb1b59fcb317666fecdd (diff)
Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server.
-rw-r--r--fb/wfbrename.h2
-rw-r--r--hw/xfree86/dixmods/Makefile.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 7b7d81e56..9721bc607 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -97,6 +97,7 @@
#define fbGlyph32 wfbGlyph32
#define fbGlyph8 wfbGlyph8
#define fbGlyphIn wfbGlyphIn
+#define fbHasVisualTypes wfbHasVisualTypes
#define fbImageGlyphBlt wfbImageGlyphBlt
#define fbIn wfbIn
#define fbInitializeColormap wfbInitializeColormap
@@ -165,6 +166,7 @@
#define fbSetSpans wfbSetSpans
#define fbSetupScreen wfbSetupScreen
#define fbSetVisualTypes wfbSetVisualTypes
+#define fbSetVisualTypesAndMasks wfbSetVisualTypesAndMasks
#define _fbSetWindowPixmap _wfbSetWindowPixmap
#define fbSolid wfbSolid
#define fbSolid24 wfbSolid24
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 54bc09948..c34ddd6e3 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -70,7 +70,7 @@ libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
libwfb_la_LDFLAGS = -avoid-version
libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
-libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+libwfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
libglx_la_LDFLAGS = -avoid-version
if AIGLX