Author: jim Date: 2005-08-28 22:50:17 -0600 (Sun, 28 Aug 2005) New Revision: 1086
Added: trunk/ntp/ trunk/ntp/ntp-4.2.0-gcc4-1.patch Modified: trunk/ Log: [EMAIL PROTECTED]: jim | 2005-08-28 21:49:10 -0700 Added: ntp-4.2.0-gcc4-1.patch Property changes on: trunk ___________________________________________________________________ Name: svk:merge - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1192 + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1193 Added: trunk/ntp/ntp-4.2.0-gcc4-1.patch =================================================================== --- trunk/ntp/ntp-4.2.0-gcc4-1.patch 2005-08-29 04:49:26 UTC (rev 1085) +++ trunk/ntp/ntp-4.2.0-gcc4-1.patch 2005-08-29 04:50:17 UTC (rev 1086) @@ -0,0 +1,55 @@ +Submitted By: William Harrington <[EMAIL PROTECTED]> +Date: 2005-08-20 +Initial Package Version: 4.2.0 +Upstream Status: Submitted +Origin: ISC +Description: Fixes for build with gcc4 + +diff -Naur ntp-4.2.0.orig/include/ntp_control.h ntp-4.2.0/include/ntp_control.h +--- ntp-4.2.0.orig/include/ntp_control.h 2003-08-14 07:31:47.000000000 +0000 ++++ ntp-4.2.0/include/ntp_control.h 2005-08-21 00:33:51.392708240 +0000 +@@ -266,6 +266,7 @@ + u_char tr_flags; /* trap flags */ + u_char tr_version; /* version number of trapper */ + }; ++extern struct ctl_trap ctl_trap[]; + + /* + * Flag bits +diff -Naur ntp-4.2.0.orig/include/ntp_refclock.h ntp-4.2.0/include/ntp_refclock.h +--- ntp-4.2.0.orig/include/ntp_refclock.h 2003-07-17 10:27:16.000000000 +0000 ++++ ntp-4.2.0/include/ntp_refclock.h 2005-08-21 00:33:51.391708392 +0000 +@@ -65,6 +65,7 @@ + const char *clocktype; /* long description */ + const char *abbrev; /* short description */ + }; ++extern struct clktype clktypes[]; + + /* + * Configuration flag values +diff -Naur ntp-4.2.0.orig/include/ntp_stdlib.h ntp-4.2.0/include/ntp_stdlib.h +--- ntp-4.2.0.orig/include/ntp_stdlib.h 2003-07-17 10:27:16.000000000 +0000 ++++ ntp-4.2.0/include/ntp_stdlib.h 2005-08-21 00:33:51.390708544 +0000 +@@ -133,10 +133,6 @@ + extern u_char * cache_key; /* key pointer */ + extern u_int cache_keylen; /* key length */ + +-/* clocktypes.c */ +-struct clktype; +-extern struct clktype clktypes[]; +- + /* getopt.c */ + extern char * ntp_optarg; /* global argument pointer */ + extern int ntp_optind; /* global argv index */ +diff -Naur ntp-4.2.0.orig/include/ntpd.h ntp-4.2.0/include/ntpd.h +--- ntp-4.2.0.orig/include/ntpd.h 2003-09-13 03:08:04.000000000 +0000 ++++ ntp-4.2.0/include/ntpd.h 2005-08-21 00:33:51.391708392 +0000 +@@ -226,8 +226,6 @@ + #endif + + /* ntp_control.c */ +-struct ctl_trap; +-extern struct ctl_trap ctl_trap[]; + extern int num_ctl_traps; + extern keyid_t ctl_auth_keyid; /* keyid used for authenticating write requests */ + -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
