[Bug 2179] Remove sntp/header.h

bk: 4fb1f4c1gZ1mzW6h0i0TAcC7KNUXmA

diff --git a/ChangeLog b/ChangeLog
index 23f0edb492e252b27c9ea5f9c5466bfaedd61831..38cbd6e12cbded958fbc075e6a3bccd9680a444b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2179] Remove sntp/header.h.
 (4.2.7p275) 2012/04/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1744] Remove obsolete ntpdate/ntptime* items.
 (4.2.7p274) 2012/04/25 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 91f8c1b727bebdb77d597e44df079e8bc70cc71f..e1c282a13318e1f68754b57ab79ed48e96622180 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -90,7 +90,6 @@ sntp_SOURCES =                \
 noinst_HEADERS =               \
        crypto.h                \
        data_formats.h          \
-       header.h                \
        kod_management.h        \
        log.h                   \
        main.h                  \

diff --git a/sntp/header.h b/sntp/header.h
deleted file mode 100644 (file)
index ff2af5e..0000000
--- a/sntp/header.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  Copyright (C) 1996 N.M. Maclaren
-    Copyright (C) 1996 The University of Cambridge
-
-This includes all of the 'safe' headers and definitions used across modules.
-No changes should be needed for any system that is even remotely like Unix. */
-
-
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-
-#define MAX_SOCKETS        10          /* Maximum number of addresses */
-
-#ifndef LOCKNAME
-#    define LOCKNAME "/etc/sntp.pid"  /* Stores the pid */
-#endif
-#ifndef SAVENAME
-#    define SAVENAME "/etc/sntp.state" /* Stores the recovery state */
-#endif
-
-
-/* Defined in main.c */
-
-#define op_client           1          /* Behave as a challenge client */
-#define op_listen           2          /* Behave as a listening client */
-
-/* extern const char *argv0;
-
-extern int verbose, operation;
-
-extern const char *lockname;
-
-extern void fatal (int syserr, const char *message, const char *insert);
-
-
-
- Defined in unix.c */
-
-extern void do_nothing (int seconds);
-
-extern int ftty (FILE *file);
-
-extern void set_lock (int lock);
-
-extern void log_message (const char *message);
-
-
-
-/* Defined in internet.c */
-
-/* extern void find_address (struct in_addr *address, int *port, char *hostname,
-    int timespan); */
-
-#define PREF_FAM_INET  1
-#define PREF_FAM_INET6 2
-extern void preferred_family(int);
-
-
-/* Defined in socket.c */
-
-extern void open_socket (int which, char *hostnames, int timespan);
-
-extern void write_socket (int which, void *packet, int length);
-
-extern int read_socket (int which, void *packet, int length, int waiting);
-
-extern int flush_socket (int which);
-
-/* extern void close_socket (int which); */
-
-
-
-/* Defined in timing.c */
-
-extern double current_time (double offset);
-
-extern time_t convert_time (double value, int *millisecs);
-
-extern void adjust_time (double difference, int immediate, double ignore);