diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-23 21:27:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-23 21:27:29 +0000 |
| commit | 8642165344217877b8a70811d19e09b584a0e10a (patch) | |
| tree | 7aaafd7f6309182227757777f352b7a2f0adcaef /libc/upstream-openbsd | |
| parent | 0ab5fd9a5af4cd00572e4881f46c1e6f974f657c (diff) | |
| parent | 08dc9d83a278e48b95e2bc72b592502f2d416826 (diff) | |
| download | bionic-8642165344217877b8a70811d19e09b584a0e10a.zip bionic-8642165344217877b8a70811d19e09b584a0e10a.tar.gz bionic-8642165344217877b8a70811d19e09b584a0e10a.tar.bz2 | |
Merge "Sync with some upstream OpenBSD #include cleanup."
Diffstat (limited to 'libc/upstream-openbsd')
| -rw-r--r-- | libc/upstream-openbsd/lib/libc/gdtoa/ldtoa.c | 4 | ||||
| -rw-r--r-- | libc/upstream-openbsd/lib/libc/net/htonl.c | 4 | ||||
| -rw-r--r-- | libc/upstream-openbsd/lib/libc/net/htons.c | 4 | ||||
| -rw-r--r-- | libc/upstream-openbsd/lib/libc/net/ntohl.c | 4 | ||||
| -rw-r--r-- | libc/upstream-openbsd/lib/libc/net/ntohs.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libc/upstream-openbsd/lib/libc/gdtoa/ldtoa.c b/libc/upstream-openbsd/lib/libc/gdtoa/ldtoa.c index 793d71c..16f6f9c 100644 --- a/libc/upstream-openbsd/lib/libc/gdtoa/ldtoa.c +++ b/libc/upstream-openbsd/lib/libc/gdtoa/ldtoa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldtoa.c,v 1.1 2008/09/07 20:36:08 martynas Exp $ */ +/* $OpenBSD: ldtoa.c,v 1.2 2014/08/10 02:15:18 guenther Exp $ */ /*- * Copyright (c) 2003 David Schultz <das@FreeBSD.ORG> * All rights reserved. @@ -30,7 +30,7 @@ #include <machine/ieee.h> #endif /* !__vax__ */ #include <float.h> -#include <inttypes.h> +#include <stdint.h> #include <limits.h> #include <math.h> #include <stdlib.h> diff --git a/libc/upstream-openbsd/lib/libc/net/htonl.c b/libc/upstream-openbsd/lib/libc/net/htonl.c index 5ab4189..6ee6e7e 100644 --- a/libc/upstream-openbsd/lib/libc/net/htonl.c +++ b/libc/upstream-openbsd/lib/libc/net/htonl.c @@ -1,11 +1,11 @@ -/* $OpenBSD: htonl.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ +/* $OpenBSD: htonl.c,v 1.7 2014/07/21 01:51:10 guenther Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. */ #include <sys/types.h> -#include <machine/endian.h> +#include <endian.h> #undef htonl diff --git a/libc/upstream-openbsd/lib/libc/net/htons.c b/libc/upstream-openbsd/lib/libc/net/htons.c index c8b73fd..f48d91e 100644 --- a/libc/upstream-openbsd/lib/libc/net/htons.c +++ b/libc/upstream-openbsd/lib/libc/net/htons.c @@ -1,11 +1,11 @@ -/* $OpenBSD: htons.c,v 1.8 2005/08/06 20:30:03 espie Exp $ */ +/* $OpenBSD: htons.c,v 1.9 2014/07/21 01:51:10 guenther Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. */ #include <sys/types.h> -#include <machine/endian.h> +#include <endian.h> #undef htons diff --git a/libc/upstream-openbsd/lib/libc/net/ntohl.c b/libc/upstream-openbsd/lib/libc/net/ntohl.c index 36414b7..0d05bac 100644 --- a/libc/upstream-openbsd/lib/libc/net/ntohl.c +++ b/libc/upstream-openbsd/lib/libc/net/ntohl.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ntohl.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ +/* $OpenBSD: ntohl.c,v 1.7 2014/07/21 01:51:10 guenther Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. */ #include <sys/types.h> -#include <machine/endian.h> +#include <endian.h> #undef ntohl diff --git a/libc/upstream-openbsd/lib/libc/net/ntohs.c b/libc/upstream-openbsd/lib/libc/net/ntohs.c index 8f345e8..b5ea361 100644 --- a/libc/upstream-openbsd/lib/libc/net/ntohs.c +++ b/libc/upstream-openbsd/lib/libc/net/ntohs.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ntohs.c,v 1.8 2005/08/06 20:30:03 espie Exp $ */ +/* $OpenBSD: ntohs.c,v 1.9 2014/07/21 01:51:10 guenther Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. */ #include <sys/types.h> -#include <machine/endian.h> +#include <endian.h> #undef ntohs |