[617118d] | 1 | Submitted By: Ryan Oliver <ryan.oliver@pha.com.au> |
---|
| 2 | Date: 2005-04-25 |
---|
| 3 | Initial Package Version: 4.2.0 |
---|
| 4 | Origin: Fedora Project |
---|
| 5 | http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/ntp/devel/ |
---|
| 6 | Description: Fix compilation issues with gcc4 |
---|
| 7 | |
---|
| 8 | --- ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h.gcc4 2005-03-08 14:29:42.940559784 +0100 |
---|
| 9 | +++ ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h 2005-03-08 14:29:43.015548384 +0100 |
---|
| 10 | @@ -133,10 +133,6 @@ |
---|
| 11 | extern u_char * cache_key; /* key pointer */ |
---|
| 12 | extern u_int cache_keylen; /* key length */ |
---|
| 13 | |
---|
| 14 | -/* clocktypes.c */ |
---|
| 15 | -struct clktype; |
---|
| 16 | -extern struct clktype clktypes[]; |
---|
| 17 | - |
---|
| 18 | /* getopt.c */ |
---|
| 19 | extern char * ntp_optarg; /* global argument pointer */ |
---|
| 20 | extern int ntp_optind; /* global argv index */ |
---|
| 21 | --- ntp-stable-4.2.0a-20040617/include/ntp_refclock.h.gcc4 2004-02-25 06:57:56.000000000 +0100 |
---|
| 22 | +++ ntp-stable-4.2.0a-20040617/include/ntp_refclock.h 2005-03-08 14:29:43.015548384 +0100 |
---|
| 23 | @@ -65,6 +65,7 @@ |
---|
| 24 | const char *clocktype; /* long description */ |
---|
| 25 | const char *abbrev; /* short description */ |
---|
| 26 | }; |
---|
| 27 | +extern struct clktype clktypes[]; |
---|
| 28 | |
---|
| 29 | /* |
---|
| 30 | * Configuration flag values |
---|
| 31 | --- ntp-stable-4.2.0a-20040617/include/ntpd.h.gcc4 2004-05-25 13:02:24.000000000 +0200 |
---|
| 32 | +++ ntp-stable-4.2.0a-20040617/include/ntpd.h 2005-03-08 14:29:43.016548232 +0100 |
---|
| 33 | @@ -225,8 +225,6 @@ |
---|
| 34 | #endif |
---|
| 35 | |
---|
| 36 | /* ntp_control.c */ |
---|
| 37 | -struct ctl_trap; |
---|
| 38 | -extern struct ctl_trap ctl_trap[]; |
---|
| 39 | extern int num_ctl_traps; |
---|
| 40 | extern keyid_t ctl_auth_keyid; /* keyid used for authenticating write requests */ |
---|
| 41 | |
---|
| 42 | --- ntp-stable-4.2.0a-20040617/include/ntp_control.h.gcc4 2004-05-25 13:02:23.000000000 +0200 |
---|
| 43 | +++ ntp-stable-4.2.0a-20040617/include/ntp_control.h 2005-03-08 14:29:43.016548232 +0100 |
---|
| 44 | @@ -268,6 +268,7 @@ |
---|
| 45 | u_char tr_flags; /* trap flags */ |
---|
| 46 | u_char tr_version; /* version number of trapper */ |
---|
| 47 | }; |
---|
| 48 | +extern struct ctl_trap ctl_trap[]; |
---|
| 49 | |
---|
| 50 | /* |
---|
| 51 | * Flag bits |
---|