diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-12-07 08:44:40 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-12-07 08:44:40 +0000 |
| commit | 3125e741808402202a24b2c68745b1194d7b69d1 (patch) | |
| tree | 9e60461f1585d752e70488f84fbd4e18351d66ee /patches | |
| parent | 9218798f97634a9e3e51396f954135b7116cf290 (diff) | |
| download | ptxdist-3125e741808402202a24b2c68745b1194d7b69d1.tar.gz ptxdist-3125e741808402202a24b2c68745b1194d7b69d1.tar.xz | |
added patch for correct ntp_config.h
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3493 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ntp-4.2.0/generic/ntp-4.2.0-config.diff | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/patches/ntp-4.2.0/generic/ntp-4.2.0-config.diff b/patches/ntp-4.2.0/generic/ntp-4.2.0-config.diff new file mode 100644 index 000000000..875759c67 --- /dev/null +++ b/patches/ntp-4.2.0/generic/ntp-4.2.0-config.diff @@ -0,0 +1,61 @@ +# +# Submitted-By: Robert Schwebel, 2005-12-07 +# Committed-By: Robert Schwebel, 2005-12-07 +# +# Error: +# +# if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../include -I../include \ +# ... -g -O2 -Wall -Wcast-qual -Wmissing-prototypes -Wpointer-arith \ +# -Wshadow -Wstrict-prototypes -MT ntp_config.o -MD -MP -MF ".deps/ntp_config.Tpo" \ +# -c -o ntp_config.o `test -f 'ntp_config.c' || echo './'`ntp_config.c; \ +# then mv -f ".deps/ntp_config.Tpo" ".deps/ntp_config.Po"; \ +# else rm -f ".deps/ntp_config.Tpo"; exit 1; \ +# fi +# ntp_config.c:79: error: `CONFIG_KEYS' undeclared here (not in a function) +# +# Description: +# +# When compiling with NATIVE=1 it may happen that some system include file comes +# before ntp_config.h and seems to undefine CONFIG_KEYS again. Reordering the +# includes fixes this. +# +# State: +# +# not submitted to upstream +# + +diff -urN ntp-4.2.0/ntpd/ntp_config.c ntp-4.2.0-config/ntpd/ntp_config.c +--- ntp-4.2.0/ntpd/ntp_config.c 2003-10-07 10:35:14.000000000 +0200 ++++ ntp-4.2.0-config/ntpd/ntp_config.c 2005-12-07 09:11:16.000000000 +0100 +@@ -9,15 +9,6 @@ + # include <netinfo/ni.h> + #endif + +-#include "ntpd.h" +-#include "ntp_io.h" +-#include "ntp_unixtime.h" +-#include "ntp_refclock.h" +-#include "ntp_filegen.h" +-#include "ntp_stdlib.h" +-#include "ntp_config.h" +-#include "ntp_cmdargs.h" +- + #include <stdio.h> + #include <ctype.h> + #ifdef HAVE_SYS_PARAM_H +@@ -40,6 +31,15 @@ + + #include <netdb.h> + ++#include "ntpd.h" ++#include "ntp_io.h" ++#include "ntp_unixtime.h" ++#include "ntp_refclock.h" ++#include "ntp_filegen.h" ++#include "ntp_stdlib.h" ++#include "ntp_config.h" ++#include "ntp_cmdargs.h" ++ + extern int priority_done; + + /* |