diff options
| author | Fritz Elfert <felfert@to.com> | 2000-08-02 03:39:20 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2000-08-02 03:39:20 +0000 |
| commit | b6e35c977928bc4fb15b5346128db9823412e6b4 (patch) | |
| tree | a76fada4bf540347bdf44ee9fff5c15a2100acb9 /plpnfsd | |
| parent | dbc2d14e0727d8e2f4b8e805c433e50c8664d64d (diff) | |
| download | plptools-b6e35c977928bc4fb15b5346128db9823412e6b4.tar.gz plptools-b6e35c977928bc4fb15b5346128db9823412e6b4.tar.bz2 plptools-b6e35c977928bc4fb15b5346128db9823412e6b4.zip | |
Get rid of second configuration header defs.h[.in].
Configuration now is in config.h and this is included as the very first header.
Diffstat (limited to 'plpnfsd')
| -rw-r--r-- | plpnfsd/main.cc | 7 | ||||
| -rw-r--r-- | plpnfsd/mp_main.c | 6 | ||||
| -rw-r--r-- | plpnfsd/mp_mount.c | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/plpnfsd/main.cc b/plpnfsd/main.cc index 6bf0f01..ef9abdd 100644 --- a/plpnfsd/main.cc +++ b/plpnfsd/main.cc @@ -3,6 +3,10 @@ // Copyright (C) 1999 Fritz Elfert <felfert@to.com> // +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stream.h> #include <string.h> #include <stdlib.h> @@ -10,7 +14,6 @@ #include <signal.h> #include <syslog.h> -#include "defs.h" #include "bool.h" #include "rfsv.h" #include "rfsvfactory.h" @@ -284,7 +287,7 @@ void usage() int main(int argc, char**argv) { ppsocket *skt; char *user = 0L; - char *mdir = DDIR; + char *mdir = DMOUNTPOINT; int sockNum = DPORT; int verbose = 0; int status = 0; diff --git a/plpnfsd/mp_main.c b/plpnfsd/mp_main.c index 3c3cab9..80e3d82 100644 --- a/plpnfsd/mp_main.c +++ b/plpnfsd/mp_main.c @@ -6,6 +6,11 @@ * Modifications for plputils by Fritz Elfert <felfert@to.com> * */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <OSdefs.h> #include <stdio.h> #include <signal.h> @@ -16,7 +21,6 @@ #include <errno.h> #include "nfs_prot.h" #include "mp.h" -#include "defs.h" #if defined (__SVR4) || defined(__sgi) #include <stdlib.h> /* getenv */ #include <string.h> /* strcmp */ diff --git a/plpnfsd/mp_mount.c b/plpnfsd/mp_mount.c index 0f9e1e9..da5d2c8 100644 --- a/plpnfsd/mp_mount.c +++ b/plpnfsd/mp_mount.c @@ -6,6 +6,11 @@ * Modifications for plputils by Fritz Elfert <felfert@to.com> * */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if defined(__SVR4) || defined(__sgi) || defined(linux) #include <stdlib.h> #include <unistd.h> @@ -38,7 +43,6 @@ extern int inet_addr(char *); #define umount(dir) unmount(dir) #endif -#include "defs.h" static char nfshost[128]; |