From: Paul Mackerras <paulus@ozlabs.org>
Date: Thu, 3 Oct 2019 22:31:48 +0000 (+1000)
Subject: Revert "pppd: Include time.h before using time_t"
X-Git-Tag: ppp-2.4.8~15
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=0d004db25edd42f6720f48eedc51f68a781278db;hp=e400854cda14e5718fd888418911d4bfba31b0f1

Revert "pppd: Include time.h before using time_t"

This reverts commit b6cd5586f72852f56428749202779af596353b9e
because it break compilation on Solaris with the following error:

/opt/SUNWspro/bin/cc -D_KERNEL -DSVR4 -DSOL2 -DPRIOQ -DDEBUG
-I../include -O -Xa -xO2 -xspace -W0,-Lt -c ppp.c
"ppp.c", line 113: identifier redeclared: time
        current : long
        previous: function(pointer to long) returning long :
"/usr/include/iso/time_iso.h", line 91
cc: acomp failed for ppp.c

The include/net/ppp_defs.h header is used in the Solaris kernel
driver and hence can't include userland headers.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
index ed04486..b06eda5 100644
--- a/include/net/ppp_defs.h
+++ b/include/net/ppp_defs.h
@@ -35,8 +35,6 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <time.h>
-
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_