Merge from vendor branch LIBARCHIVE:
[dragonfly.git] / usr.sbin / ntpd / patches / ntpd.c.patch
1 $DragonFly: src/usr.sbin/ntpd/patches/Attic/ntpd.c.patch,v 1.2 2004/11/09 21:29:34 joerg Exp $
2
3 --- ntpd.c.orig 2004-11-09 20:39:54.000000000 +0100
4 +++ ntpd.c      2004-11-09 20:40:48.000000000 +0100
5 @@ -66,9 +66,7 @@
6  void
7  usage(void)
8  {
9 -       extern char *__progname;
10 -
11 -       fprintf(stderr, "usage: %s [-dSs] [-f file]\n", __progname);
12 +       fprintf(stderr, "usage: %s [-dSs] [-f file]\n", getprogname());
13         exit(1);
14  }
15  
16 @@ -79,7 +79,7 @@
17         struct ntpd_conf         conf;
18         struct pollfd            pfd[POLL_MAX];
19         pid_t                    chld_pid = 0, pid;
20 -       char                    *conffile;
21 +       const char              *conffile;
22         int                      ch, nfds, timeout = INFTIM;
23         int                      pipe_chld[2];
24