diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2019-12-29 00:45:51 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:50:30 +0100 |
commit | 662708b3d49aa2772a855a337369ed882a41da9a (patch) | |
tree | 538f89853a1d97bce5a7bc1398b3b44d0a8432e9 /nx-X11 | |
parent | 2c03bd793a786004822902a04ad97f921c1380e5 (diff) | |
download | nx-libs-662708b3d49aa2772a855a337369ed882a41da9a.tar.gz nx-libs-662708b3d49aa2772a855a337369ed882a41da9a.tar.bz2 nx-libs-662708b3d49aa2772a855a337369ed882a41da9a.zip |
drop xprint remnants: xpstubs
Backport from xorg-xserver:
commit 641ce9c706ce3cbf726fb3fc9623161bb96ba127
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Jan 3 17:28:04 2008 +0200
drop xprint remnants: xpstubs
Diffstat (limited to 'nx-X11')
-rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 7 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/dix/xpstubs.c | 50 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 3 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Imakefile | 3 |
4 files changed, 0 insertions, 63 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index 3cdcdd9bf..d153805df 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -2,9 +2,6 @@ NULL = #include <Server.tmpl> -XPSRC = xpstubs.c -XPOBJ = xpstubs.o - #if !HasFfs FFS_SRC = ffs.c FFS_OBJ = ffs.o @@ -129,8 +126,6 @@ VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) $(QUARTZ_DEFINES) NormalLibraryObjectRule() NormalLibraryTarget(dix,$(OBJS)) -LintLibraryTarget(dix,$(SRCS) $(XPSRC)) -NormalLintTarget($(SRCS) $(XPSRC)) SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES) $(EXT_DEFINES)) SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES)) @@ -138,6 +133,4 @@ SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_)) SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_)) SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES)) -NormalLibraryTarget(xpstubs,$(XPOBJ)) - DependTarget() diff --git a/nx-X11/programs/Xserver/dix/xpstubs.c b/nx-X11/programs/Xserver/dix/xpstubs.c deleted file mode 100644 index f8cd207eb..000000000 --- a/nx-X11/programs/Xserver/dix/xpstubs.c +++ /dev/null @@ -1,50 +0,0 @@ -/* -Copyright 1996, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. -*/ - - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "misc.h" -#include <X11/fonts/font.h> -extern Bool XpClientIsBitmapClient(ClientPtr client); -extern Bool XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe); - -Bool -XpClientIsBitmapClient( - ClientPtr client) -{ - return TRUE; -} - -Bool -XpClientIsPrintClient( - ClientPtr client, - FontPathElementPtr fpe) -{ - return FALSE; -} diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 93fb93295..ddae19cf0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -469,9 +469,6 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL); #endif /* HAS_XFONT2 */ - if (requestingClient && XpClientIsPrintClient(requestingClient, NULL)) - return True; - name_atom = MakeAtom("FONT", 4, True); value_atom = 0L; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index b6a343e68..e37f97e84 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -59,7 +59,6 @@ SRCS = \ Composite.c \ Pixels.c \ stubs.c \ - xpstubs.c \ miinitext.c \ $(NULL) @@ -116,7 +115,6 @@ OBJS = \ Composite.o \ Pixels.o \ stubs.o \ - xpstubs.o \ miinitext.o \ $(NULL) @@ -264,7 +262,6 @@ DEFINES = \ all:: $(OBJS) LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) -LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_)) |