summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2005-07-12 03:09:20 +0000
committerKeith Packard <keithp@keithp.com>2005-07-12 03:09:20 +0000
commit697cf74fb50a550b8f7e124dc8f463a55519795f (patch)
tree6cc5c0792690a7ad9bce5d79c3e4c5fc5d6298d2
parent419448ea7b0d7f672e568cb1d8b4e190a1f54825 (diff)
Make Xprt run when linked against Xlib for Xrm
-rw-r--r--Xprint/attributes.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 2a37e6b57..2cb082ce3 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -50,11 +50,17 @@ copyright holders.
#endif
#include <X11/Xproto.h>
+#include <stdio.h>
+#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <pwd.h>
#include <grp.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
#if (defined(sun) && defined(SVR4)) || (defined(SCO))
#include <wchar.h>
#endif
@@ -64,9 +70,8 @@ copyright holders.
#include "attributes.h"
-#include "Xlib.h"
-#include "Xresource.h"
-#include "Xrm.c"
+#include <X11/Xlib.h>
+#include <X11/Xresource.h>
#include "spooler.h"
@@ -805,6 +810,8 @@ PutByte(
pStr->space--;
}
+#define XrmQString XrmPermStringToQuark("String")
+
/*
* AppendEntry is called by XrmEnumerateDatabase, and serves to append
* a database entry onto a string database. The passed-in "closure"
@@ -1314,7 +1321,6 @@ SendFileToCommand(
* store for the supplied print context. The ReplaceAnyString utility
* routine is used to perform the actual replacements.
*/
-extern char *ReplaceAnyString(char *, char *, char *);
static char *
ReplaceAllKeywords(