Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
useful any more. (George Fufutos)
This commit is contained in:
parent
c03b06bdf0
commit
1bbd5e49b1
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2006-02-15 Eric Anholt <anholt@FreeBSD.org>
|
||||||
|
|
||||||
|
* XTrap/xtrapddmi.c:
|
||||||
|
* XTrap/xtrapdi.c:
|
||||||
|
* Xext/Makefile.am:
|
||||||
|
* hw/xfree86/dixmods/extmod/Makefile.am:
|
||||||
|
* hw/xfree86/dixmods/extmod/xf86dga2.c: (XFree86DGARegister):
|
||||||
|
Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
|
||||||
|
useful any more. (George Fufutos)
|
||||||
|
|
||||||
2006-02-15 Eric Anholt <anholt@FreeBSD.org>
|
2006-02-15 Eric Anholt <anholt@FreeBSD.org>
|
||||||
|
|
||||||
* hw/xfree86/dixmods/laymodule.c:
|
* hw/xfree86/dixmods/laymodule.c:
|
||||||
|
|
|
@ -42,7 +42,6 @@ SOFTWARE.
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef EXTMODULE
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <X11/Xos.h>
|
#include <X11/Xos.h>
|
||||||
#ifdef PC
|
#ifdef PC
|
||||||
|
@ -50,7 +49,6 @@ SOFTWARE.
|
||||||
# include "io.h"
|
# include "io.h"
|
||||||
# define O_NDELAY 0L
|
# define O_NDELAY 0L
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#define NEED_REPLIES
|
#define NEED_REPLIES
|
||||||
#define NEED_EVENTS
|
#define NEED_EVENTS
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.5 2005/07/03 08:53:36 daniels Exp $ */
|
/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.6 2006/02/10 22:00:19 anholt Exp $ */
|
||||||
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
|
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
|
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
|
||||||
|
@ -55,11 +55,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef EXTMODULE
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <X11/Xos.h>
|
#include <X11/Xos.h>
|
||||||
#endif
|
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include <X11/Xproto.h>
|
#include <X11/Xproto.h>
|
||||||
#include "input.h" /* Server DevicePtr definitions */
|
#include "input.h" /* Server DevicePtr definitions */
|
||||||
|
|
|
@ -130,7 +130,7 @@ libXext_la_SOURCES = $(BUILTIN_SRCS) $(MODULE_SRCS)
|
||||||
libXextbuiltin_la_SOURCES = $(BUILTIN_SRCS)
|
libXextbuiltin_la_SOURCES = $(BUILTIN_SRCS)
|
||||||
|
|
||||||
libXextmodule_la_SOURCES = $(MODULE_SRCS)
|
libXextmodule_la_SOURCES = $(MODULE_SRCS)
|
||||||
libXextmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@ -DEXTMODULE
|
libXextmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
README.xtest1-ddx \
|
README.xtest1-ddx \
|
||||||
|
|
|
@ -11,7 +11,7 @@ if XV
|
||||||
XV_SRCS = xvmod.c xvmodproc.h
|
XV_SRCS = xvmod.c xvmodproc.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @SERVER_DEFINES@ @LOADER_DEFINES@
|
AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
|
||||||
INCLUDES = @XORG_INCS@ \
|
INCLUDES = @XORG_INCS@ \
|
||||||
-I$(top_srcdir)/afb \
|
-I$(top_srcdir)/afb \
|
||||||
-I$(top_srcdir)/mfb \
|
-I$(top_srcdir)/mfb \
|
||||||
|
|
|
@ -762,10 +762,8 @@ ProcXDGADispatch (ClientPtr client)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef EXTMODULE
|
|
||||||
void
|
void
|
||||||
XFree86DGARegister(INITARGS)
|
XFree86DGARegister(INITARGS)
|
||||||
{
|
{
|
||||||
XDGAEventBase = &DGAEventBase;
|
XDGAEventBase = &DGAEventBase;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user