summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrws <empty>1991-07-18 21:03:43 +0000
committerrws <empty>1991-07-18 21:03:43 +0000
commitde56d1d9133ac5236e0049d744c464f5ff451aaf (patch)
tree49b383021e913c73fc3bcc7a144b5198056068f0
parentcbdf4f67c9ccd02b5ce10c6fdc2310f1e1137fbe (diff)
remove cpp
-rw-r--r--xc/programs/xdm/dm.h3
-rw-r--r--xc/programs/xdm/dpylist.c4
-rw-r--r--xc/programs/xdm/resource.c7
3 files changed, 3 insertions, 11 deletions
diff --git a/xc/programs/xdm/dm.h b/xc/programs/xdm/dm.h
index cb3be34f9..21f9e4118 100644
--- a/xc/programs/xdm/dm.h
+++ b/xc/programs/xdm/dm.h
@@ -1,7 +1,7 @@
/*
* xdm - display manager daemon
*
- * $XConsortium: dm.h,v 1.46 91/05/06 23:53:41 gildea Exp $
+ * $XConsortium: dm.h,v 1.47 91/07/16 22:19:43 gildea Exp $
*
* Copyright 1988 Massachusetts Institute of Technology
*
@@ -173,7 +173,6 @@ struct display {
/* session resources */
char *resources; /* resource file */
char *xrdb; /* xrdb program */
- char *cpp; /* cpp program */
char *setup; /* Xsetup program */
char *startup; /* Xstartup program */
char *reset; /* Xreset program */
diff --git a/xc/programs/xdm/dpylist.c b/xc/programs/xdm/dpylist.c
index 821a6dfa8..076eb1fb6 100644
--- a/xc/programs/xdm/dpylist.c
+++ b/xc/programs/xdm/dpylist.c
@@ -1,7 +1,7 @@
/*
* xdm - display manager daemon
*
- * $XConsortium: dpylist.c,v 1.25 91/05/06 23:53:46 gildea Exp $
+ * $XConsortium: dpylist.c,v 1.26 91/07/16 22:19:56 gildea Exp $
*
* Copyright 1988 Massachusetts Institute of Technology
*
@@ -135,7 +135,6 @@ struct display *old;
IfFree (d->argv);
IfFree (d->resources);
IfFree (d->xrdb);
- IfFree (d->cpp);
IfFree (d->setup);
IfFree (d->startup);
IfFree (d->reset);
@@ -215,7 +214,6 @@ char *class;
d->state = NewEntry;
d->resources = NULL;
d->xrdb = NULL;
- d->cpp = NULL;
d->setup = NULL;
d->startup = NULL;
d->reset = NULL;
diff --git a/xc/programs/xdm/resource.c b/xc/programs/xdm/resource.c
index 02fc23f63..e430d1f4e 100644
--- a/xc/programs/xdm/resource.c
+++ b/xc/programs/xdm/resource.c
@@ -1,7 +1,7 @@
/*
* xdm - display manager daemon
*
- * $XConsortium: resource.c,v 1.40 91/01/10 10:53:59 rws Exp $
+ * $XConsortium: resource.c,v 1.41 91/07/18 18:37:36 rws Exp $
*
* Copyright 1988 Massachusetts Institute of Technology
*
@@ -80,9 +80,6 @@ char *randomFile;
#ifndef DEF_CHOOSER
#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
#endif
-#ifndef CPP_PROGRAM
-#define CPP_PROGRAM "/lib/cpp"
-#endif
#ifndef DEF_AUTH_NAME
#ifdef HASDES
#define DEF_AUTH_NAME "XDM-AUTHORIZATION-1 MIT-MAGIC-COOKIE-1"
@@ -204,8 +201,6 @@ struct displayResource sessionResources[] = {
"",
"xrdb", "Xrdb", DM_STRING, boffset(xrdb),
XRDB_PROGRAM,
-"cpp", "Cpp", DM_STRING, boffset(cpp),
- CPP_PROGRAM,
"setup", "Setup", DM_STRING, boffset(setup),
"",
"startup", "Startup", DM_STRING, boffset(startup),