diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:21:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:21:39 +0100 |
| commit | 718a58fb15e61e9aea117035527ca3c882ec054d (patch) | |
| tree | 7b8adeb1a453b8d2052270191cb6103bd6200001 /nx-X11/programs/Xserver/dix | |
| parent | d6872d4e01df9a7e329524ea311512a9cf34da3b (diff) | |
| parent | e54d2a39001bde60b6cca7795f3fa98b3e4111e6 (diff) | |
| download | nx-libs-718a58fb15e61e9aea117035527ca3c882ec054d.tar.gz nx-libs-718a58fb15e61e9aea117035527ca3c882ec054d.tar.bz2 nx-libs-718a58fb15e61e9aea117035527ca3c882ec054d.zip | |
Merge branch 'uli42-pr/simplify_nxextension' into 3.6.x
Attributes GH PR #861: https://github.com/ArcticaProject/nx-libs/pull/861
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/extension.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index ccdae3b82..3cdcdd9bf 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -15,7 +15,6 @@ NXAGENT_SKIP_SRCS = \ dispatch.c \ dixfonts.c \ events.c \ - extension.c \ glyphcurs.c \ property.c \ resource.c \ @@ -25,7 +24,6 @@ NXAGENT_SKIP_OBJS = \ dispatch.o \ dixfonts.o \ events.o \ - extension.o \ glyphcurs.o \ property.o \ resource.o \ @@ -40,6 +38,7 @@ SRCS = \ cursor.c \ devices.c \ dixutils.c \ + extension.c \ gc.c \ globals.c \ grabs.c \ @@ -61,6 +60,7 @@ OBJS = \ cursor.o \ devices.o \ dixutils.o \ + extension.o \ gc.o \ globals.o \ grabs.o \ diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index 763f57337..74558dd07 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -332,7 +332,6 @@ CloseDownExtensions() } } -#ifndef NXAGENT_SERVER int ProcQueryExtension(ClientPtr client) { @@ -437,7 +436,6 @@ ProcListExtensions(ClientPtr client) } return(client->noClientException); } -#endif ExtensionLookupProc LookupProc(char *name, GCPtr pGC) |