diff options
| author | alanh <alanh> | 2000-07-10 21:17:26 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2000-07-10 21:17:26 +0000 |
| commit | 30722f5171428576252260bfe13e2dcd8f622a4d (patch) | |
| tree | da831e272145819ef138fd4ca1183f2b782ac2d1 /xc/programs/Xserver/hw/xnest | |
| parent | 55378d1c9953642fb1b327237d51287d4d8beefb (diff) | |
Import of XFree86 4.0.1X_4_0_1
Diffstat (limited to 'xc/programs/Xserver/hw/xnest')
| -rw-r--r-- | xc/programs/Xserver/hw/xnest/Display.h | 4 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xnest/Imakefile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xnest/Display.h b/xc/programs/Xserver/hw/xnest/Display.h index c0d554fe4..6f5c15d7d 100644 --- a/xc/programs/Xserver/hw/xnest/Display.h +++ b/xc/programs/Xserver/hw/xnest/Display.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.3 1998/12/20 22:18:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.4 2000/06/17 00:27:33 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H @@ -20,7 +20,7 @@ is" without express or implied warranty. #define UNDEFINED -1 #define MAXDEPTH 32 -#define MAXVISUALSPERDEPTH 32 +#define MAXVISUALSPERDEPTH 64 extern Display *xnestDisplay; extern XVisualInfo *xnestVisuals; diff --git a/xc/programs/Xserver/hw/xnest/Imakefile b/xc/programs/Xserver/hw/xnest/Imakefile index 9725d5e1d..0e308bd3d 100644 --- a/xc/programs/Xserver/hw/xnest/Imakefile +++ b/xc/programs/Xserver/hw/xnest/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/12 1997/11/03 14:13:20 kaleb $ -XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.15 2000/01/25 18:37:48 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.18 2000/06/28 19:06:18 tsi Exp $ #include <Server.tmpl> #ifdef OS2Architecture @@ -53,15 +53,15 @@ OBJS = Args.o \ INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I../../mi -I../../include -I../../os \ -I$(EXTINCSRC) -I$(XINCLUDESRC) +DEFINES = $(OS_DEFINES) -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ + -UMITSHM -UXF86DRI -UXFree86LOADER all:: $(OBJS) LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) SpecialCObjectRule(Init,$(ICONFIGFILES),$(EXT_DEFINES)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(OS_DEFINES) -UXINPUT \ - -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UMITSHM -UDPMSExtension \ - -UXF86DRI -UXFree86LOADER) +SpecialCObjectRule(miinitext,$(ICONFIGFILES),-UDPMSExtension) NormalLibraryObjectRule() NormalLibraryTarget(xnest,$(OBJS)) |