]> git.ozlabs.org Git - ppp.git/commitdiff
Revert "pppd: Include time.h before using time_t"
authorPaul Mackerras <paulus@ozlabs.org>
Thu, 3 Oct 2019 22:31:48 +0000 (08:31 +1000)
committerPaul Mackerras <paulus@ozlabs.org>
Thu, 3 Oct 2019 22:31:48 +0000 (08:31 +1000)
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>
include/net/ppp_defs.h

index ed04486059b479005627018f5b0be09e292dd317..b06eda5aae3ab1a24a567e855e86d3bb97d1abc8 100644 (file)
@@ -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_