From 2ef9d01c4d3b03f0a5d829304f2a7e2cc1327f3b Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon, 10 Jan 2005 14:16:29 +0000
Subject: [PATCH] xc/programs/Xserver/Xprint/Util.c
 xc/programs/Xserver/Xprint/attributes.h
 //bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1654    
 (https://bugs.freedesktop.org/attachment.cgi?id=1654): Fix gcc4.0 build    
 failure. Patch by Egbert Eich <eich@freedesktop.org> and Roland Mainz    
 <roland.mainz@nrubsig.org>

---
 Xprint/Util.c       | 24 ------------------------
 Xprint/attributes.h |  2 --
 Xprint/ps/Ps.h      |  4 ----
 3 files changed, 30 deletions(-)

diff --git a/Xprint/Util.c b/Xprint/Util.c
index 1f4a14666..fd8ccd1c3 100644
--- a/Xprint/Util.c
+++ b/Xprint/Util.c
@@ -141,30 +141,6 @@ ReplaceFileString(
     return string;
 }
 
-/*
- * ExecCommand takes two character pointers - the command to execute,
- * and the "argv" style NULL-terminated vector of arguments for the command.
- * We wait for the command to terminate before continuing to ensure that
- * we don't delete the job file before the spooler has made a copy.
- */
-void
-ExecCommand(
-    char *pCommand,
-    char **argVector)
-{
-    pid_t childPid;
-    int status;
-
-    if((childPid = fork()) == 0)
-    {
-	execv(pCommand, argVector);
-    }
-    else
-    {
-	(void) waitpid(childPid, &status, 0);
-    }
-    return;
-}
 
 /*
  * TransferBytes reads numBytes of data from pSrcFile and writes them
diff --git a/Xprint/attributes.h b/Xprint/attributes.h
index c4e30d274..52f0fa484 100644
--- a/Xprint/attributes.h
+++ b/Xprint/attributes.h
@@ -109,8 +109,6 @@ char *ReplaceAnyString(char *string,
 char *ReplaceFileString(char *string,
                         char *inFileName,
                         char *outFileName);
-void ExecCommand(char *pCommand,
-                char **argVector);
 int TransferBytes(FILE *pSrcFile,
                  FILE *pDstFile,
                  int numBytes);
diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 726cf5aae..f8a07366b 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -350,7 +350,6 @@ typedef struct
 
 extern Bool InitializePsDriver(int ndx, ScreenPtr pScreen, int argc,
     char **argv);
-static Bool         PsDestroyContext(XpContextPtr pCon);
 extern XpContextPtr PsGetContextFromWindow(WindowPtr win);
 
 /*
@@ -374,9 +373,6 @@ extern int PsGetDocumentData(XpContextPtr pCon, ClientPtr client,
  */
 
 extern Bool PsCreateGC(GCPtr pGC);
-static int  PsGetDrawablePrivateStuff(DrawablePtr pDrawable, GC *gc,
-                                      unsigned long *valid, PsOutPtr *psOut,
-                                      ColormapPtr *cMap);
 extern PsContextPrivPtr PsGetPsContextPriv( DrawablePtr pDrawable );
 extern int  PsUpdateDrawableGC(GCPtr pGC, DrawablePtr pDrawable,
                                PsOutPtr *psOut, ColormapPtr *cMap);