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>
This commit is contained in:
parent
57387e115c
commit
2ef9d01c4d
|
@ -141,30 +141,6 @@ ReplaceFileString(
|
||||||
return string;
|
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
|
* TransferBytes reads numBytes of data from pSrcFile and writes them
|
||||||
|
|
|
@ -109,8 +109,6 @@ char *ReplaceAnyString(char *string,
|
||||||
char *ReplaceFileString(char *string,
|
char *ReplaceFileString(char *string,
|
||||||
char *inFileName,
|
char *inFileName,
|
||||||
char *outFileName);
|
char *outFileName);
|
||||||
void ExecCommand(char *pCommand,
|
|
||||||
char **argVector);
|
|
||||||
int TransferBytes(FILE *pSrcFile,
|
int TransferBytes(FILE *pSrcFile,
|
||||||
FILE *pDstFile,
|
FILE *pDstFile,
|
||||||
int numBytes);
|
int numBytes);
|
||||||
|
|
|
@ -350,7 +350,6 @@ typedef struct
|
||||||
|
|
||||||
extern Bool InitializePsDriver(int ndx, ScreenPtr pScreen, int argc,
|
extern Bool InitializePsDriver(int ndx, ScreenPtr pScreen, int argc,
|
||||||
char **argv);
|
char **argv);
|
||||||
static Bool PsDestroyContext(XpContextPtr pCon);
|
|
||||||
extern XpContextPtr PsGetContextFromWindow(WindowPtr win);
|
extern XpContextPtr PsGetContextFromWindow(WindowPtr win);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -374,9 +373,6 @@ extern int PsGetDocumentData(XpContextPtr pCon, ClientPtr client,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern Bool PsCreateGC(GCPtr pGC);
|
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 PsContextPrivPtr PsGetPsContextPriv( DrawablePtr pDrawable );
|
||||||
extern int PsUpdateDrawableGC(GCPtr pGC, DrawablePtr pDrawable,
|
extern int PsUpdateDrawableGC(GCPtr pGC, DrawablePtr pDrawable,
|
||||||
PsOutPtr *psOut, ColormapPtr *cMap);
|
PsOutPtr *psOut, ColormapPtr *cMap);
|
||||||
|
|
Loading…
Reference in New Issue