diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
| commit | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch) | |
| tree | 9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/dix | |
| parent | d842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff) | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2 vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/Makefile.in | 16 | ||||
| -rw-r--r-- | xorg-server/dix/dix.c | 0 | ||||
| -rw-r--r-- | xorg-server/dix/resource.c | 8 |
3 files changed, 20 insertions, 4 deletions
diff --git a/xorg-server/dix/Makefile.in b/xorg-server/dix/Makefile.in index c302e845f..5d0a1c73b 100644 --- a/xorg-server/dix/Makefile.in +++ b/xorg-server/dix/Makefile.in @@ -173,6 +173,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -203,6 +204,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -213,6 +221,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -262,6 +271,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -286,6 +297,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -376,7 +389,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -463,7 +475,7 @@ dist_miscconfig_DATA = protocol.txt # Generate dtrace header file for C sources to include @XSERVER_DTRACE_TRUE@BUILT_SOURCES = Xserver-dtrace.h -CLEANFILES = dix.c +CLEANFILES = dix.c Xserver-dtrace.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/xorg-server/dix/dix.c b/xorg-server/dix/dix.c new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/xorg-server/dix/dix.c diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c index e1fdad4fb..91d0cfb1c 100644 --- a/xorg-server/dix/resource.c +++ b/xorg-server/dix/resource.c @@ -141,10 +141,10 @@ Equipment Corporation. #endif #include "xace.h" #include <assert.h> +#include "registry.h" #ifdef XSERVER_DTRACE #include <sys/types.h> -#include "registry.h" typedef const char *string; #include "Xserver-dtrace.h" @@ -197,7 +197,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res) } RESTYPE -CreateNewResourceType(DeleteType deleteFunc) +CreateNewResourceType(DeleteType deleteFunc, char *name) { RESTYPE next = lastResourceType + 1; DeleteType *funcs; @@ -214,6 +214,10 @@ CreateNewResourceType(DeleteType deleteFunc) lastResourceType = next; DeleteFuncs = funcs; DeleteFuncs[next] = deleteFunc; + + /* Called even if name is NULL, to remove any previous entry */ + RegisterResourceName(next, name); + return next; } |