diff options
Diffstat (limited to 'lib/libc')
29 files changed, 50 insertions, 75 deletions
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc index e2ae5e372f4..8088e1e1c23 100644 --- a/lib/libc/Makefile.inc +++ b/lib/libc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.24 2015/08/31 19:43:39 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.25 2015/09/10 18:13:46 guenther Exp $ # # This file contains make rules used to build libc # @@ -9,7 +9,7 @@ all: .endif CFLAGS+=-I${LIBCSRCDIR}/include -I${LIBCSRCDIR}/hidden \ - -Werror-implicit-function-declaration + -Werror-implicit-function-declaration -include namespace.h # Include link-time warnings about unsafe API uses (ie. strcpy) CFLAGS+=-DAPIWARN @@ -65,4 +65,6 @@ AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include .include "${LIBCSRCDIR}/yp/Makefile.inc" .endif +${OBJS} ${GOBJS} ${POBJS} ${SOBJS} ${DOBJS}: ${LIBCSRCDIR}/include/namespace.h + CFLAGS+=-DNLS diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index bd056027b6e..dd175e6582f 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: posix_spawn.c,v 1.6 2014/11/14 23:26:34 jmatthew Exp $ */ +/* $OpenBSD: posix_spawn.c,v 1.7 2015/09/10 18:13:46 guenther Exp $ */ /*- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org> * All rights reserved. @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include "namespace.h" #include <sys/queue.h> #include <errno.h> diff --git a/lib/libc/hidden/db.h b/lib/libc/hidden/db.h index ba3d1e72d54..a8bc9ca9469 100644 --- a/lib/libc/hidden/db.h +++ b/lib/libc/hidden/db.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db.h,v 1.1 2015/09/05 11:28:35 guenther Exp $ */ +/* $OpenBSD: db.h,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_DB_H_ #include_next <db.h> -#include "namespace.h" __BEGIN_HIDDEN_DECLS DB *__bt_open(const char *, int, int, const BTREEINFO *, int); diff --git a/lib/libc/hidden/err.h b/lib/libc/hidden/err.h index d634141db9b..af01214a8a2 100644 --- a/lib/libc/hidden/err.h +++ b/lib/libc/hidden/err.h @@ -1,4 +1,4 @@ -/* $OpenBSD: err.h,v 1.1 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: err.h,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_ERR_H_ #include_next <err.h> -#include "namespace.h" PROTO_NORMAL(err); PROTO_NORMAL(errc); diff --git a/lib/libc/hidden/errno.h b/lib/libc/hidden/errno.h index ee18c32f089..7af2858746f 100644 --- a/lib/libc/hidden/errno.h +++ b/lib/libc/hidden/errno.h @@ -1,4 +1,4 @@ -/* $OpenBSD: errno.h,v 1.1 2015/09/06 20:26:20 guenther Exp $ */ +/* $OpenBSD: errno.h,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -22,7 +22,6 @@ #define __SYS_ERRLIST #include_next <errno.h> -#include "namespace.h" extern const int sys_nerr; extern const char *const sys_errlist[]; diff --git a/lib/libc/hidden/nl_types.h b/lib/libc/hidden/nl_types.h index 28ad6192a66..226dafd715c 100644 --- a/lib/libc/hidden/nl_types.h +++ b/lib/libc/hidden/nl_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nl_types.h,v 1.2 2015/09/05 11:32:10 guenther Exp $ */ +/* $OpenBSD: nl_types.h,v 1.3 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_NL_TYPES_H_ #include_next <nl_types.h> -#include "namespace.h" PROTO_NORMAL(catclose); PROTO_NORMAL(catgets); diff --git a/lib/libc/hidden/rpcsvc/yp.h b/lib/libc/hidden/rpcsvc/yp.h index 4d8ba39fe98..4f5ca85981c 100644 --- a/lib/libc/hidden/rpcsvc/yp.h +++ b/lib/libc/hidden/rpcsvc/yp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: yp.h,v 1.1 2015/09/09 15:33:18 deraadt Exp $ */ +/* $OpenBSD: yp.h,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Theo de Raadt <deraadt@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_RPCSVC_YP_H_ #include_next <rpcsvc/yp.h> -#include "namespace.h" PROTO_NORMAL(xdr_domainname); PROTO_NORMAL(xdr_keydat); diff --git a/lib/libc/hidden/signal.h b/lib/libc/hidden/signal.h index 8cbda91b72d..ca992b86e05 100644 --- a/lib/libc/hidden/signal.h +++ b/lib/libc/hidden/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.2 2015/09/09 16:10:03 guenther Exp $ */ +/* $OpenBSD: signal.h,v 1.3 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_SIGNAL_H #include_next <signal.h> -#include "namespace.h" __BEGIN_HIDDEN_DECLS extern sigset_t __sigintr; diff --git a/lib/libc/hidden/stdio.h b/lib/libc/hidden/stdio.h index 440a6bbfc8b..6f394f2059e 100644 --- a/lib/libc/hidden/stdio.h +++ b/lib/libc/hidden/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.2 2015/09/06 20:26:20 guenther Exp $ */ +/* $OpenBSD: stdio.h,v 1.3 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -22,7 +22,6 @@ #define __SYS_ERRLIST #include_next <stdio.h> -#include "namespace.h" __BEGIN_HIDDEN_DECLS char *_mktemp(char *); diff --git a/lib/libc/hidden/string.h b/lib/libc/hidden/string.h index 48278f30176..f8a92b96145 100644 --- a/lib/libc/hidden/string.h +++ b/lib/libc/hidden/string.h @@ -1,4 +1,4 @@ -/* $OpenBSD: string.h,v 1.2 2015/09/09 16:10:03 guenther Exp $ */ +/* $OpenBSD: string.h,v 1.3 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_STRING_H_ #include_next <string.h> -#include "namespace.h" __BEGIN_HIDDEN_DECLS char *__strsignal(int , char *); diff --git a/lib/libc/hidden/wchar.h b/lib/libc/hidden/wchar.h index de1891267fc..290eec61c48 100644 --- a/lib/libc/hidden/wchar.h +++ b/lib/libc/hidden/wchar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wchar.h,v 1.1 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: wchar.h,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -19,7 +19,6 @@ #define _LIBC_WCHAR_H_ #include_next <wchar.h> -#include "namespace.h" /*PROTO_NORMAL(btowc);*/ PROTO_NORMAL(fgetwc); diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h index 939515251e9..c8c864a266e 100644 --- a/lib/libc/include/namespace.h +++ b/lib/libc/include/namespace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: namespace.h,v 1.5 2015/09/06 20:26:20 guenther Exp $ */ +/* $OpenBSD: namespace.h,v 1.6 2015/09/10 18:13:46 guenther Exp $ */ #ifndef _LIBC_NAMESPACE_H_ #define _LIBC_NAMESPACE_H_ @@ -126,6 +126,8 @@ * ex: DEF_SYS(pread) */ +#include <sys/cdefs.h> /* for __dso_hidden and __{weak,strong}_alias */ + #define HIDDEN(x) _libc_##x #define CANCEL(x) _libc_##x##_cancel #define WRAP(x) _libc_##x##_wrap @@ -144,5 +146,19 @@ #define DEF_WRAP(x) __weak_alias(x, WRAP(x)) #define DEF_SYS(x) __strong_alias(_thread_sys_##x, HIDDEN(x)) + +/* + * gcc will generate calls to the functions below. + * Declare and redirect them here so we always go + * directly to our hidden aliases. + */ +#include <sys/_types.h> +void *memcpy(void *__restrict, const void *__restrict, __size_t); +void *memset(void *, int, __size_t); +void __stack_smash_handler(const char [], int __attribute__((__unused__))); +PROTO_NORMAL(memcpy); +PROTO_NORMAL(memset); +PROTO_NORMAL(__stack_smash_handler); + #endif /* _LIBC_NAMESPACE_H_ */ diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c index f977c841e94..81191ff2b58 100644 --- a/lib/libc/softfloat/fpgetmask.c +++ b/lib/libc/softfloat/fpgetmask.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetmask.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $ */ +/* $OpenBSD: fpgetmask.c,v 1.4 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: fpgetmask.c,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "namespace.h" - #include <ieeefp.h> #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c index bf6ad2d4d3f..e50c1d08e43 100644 --- a/lib/libc/softfloat/fpgetround.c +++ b/lib/libc/softfloat/fpgetround.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetround.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $ */ +/* $OpenBSD: fpgetround.c,v 1.4 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: fpgetround.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "namespace.h" - #include <ieeefp.h> #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c index c8b7c114f5b..644a2941cee 100644 --- a/lib/libc/softfloat/fpgetsticky.c +++ b/lib/libc/softfloat/fpgetsticky.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetsticky.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $ */ +/* $OpenBSD: fpgetsticky.c,v 1.4 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: fpgetsticky.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "namespace.h" - #include <ieeefp.h> #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c index 50d694cd393..3c1a2d10395 100644 --- a/lib/libc/softfloat/fpsetmask.c +++ b/lib/libc/softfloat/fpsetmask.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetmask.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $ */ +/* $OpenBSD: fpsetmask.c,v 1.4 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: fpsetmask.c,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "namespace.h" - #include <ieeefp.h> #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c index ece434367e8..a3e014b58bb 100644 --- a/lib/libc/softfloat/fpsetround.c +++ b/lib/libc/softfloat/fpsetround.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetround.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $ */ +/* $OpenBSD: fpsetround.c,v 1.4 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: fpsetround.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "namespace.h" - #include <ieeefp.h> #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c index ba2fc2adec9..09eb539c194 100644 --- a/lib/libc/softfloat/fpsetsticky.c +++ b/lib/libc/softfloat/fpsetsticky.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetsticky.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $ */ +/* $OpenBSD: fpsetsticky.c,v 1.4 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: fpsetsticky.c,v 1.2 2002/01/13 21:45:54 thorpej Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "namespace.h" - #include <ieeefp.h> #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c index d0a377010ed..cb547a8d36d 100644 --- a/lib/libc/stdlib/hcreate.c +++ b/lib/libc/stdlib/hcreate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hcreate.c,v 1.5 2014/08/10 02:15:18 guenther Exp $ */ +/* $OpenBSD: hcreate.c,v 1.6 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: hcreate.c,v 1.5 2004/04/23 02:48:12 simonb Exp $ */ /* @@ -47,7 +47,6 @@ * nobody had a copy in the office, so... */ -#include "namespace.h" #include <assert.h> #include <errno.h> #include <stdint.h> diff --git a/lib/libc/sys/stack_protector.c b/lib/libc/sys/stack_protector.c index 0e757841dc9..e4716f832b6 100644 --- a/lib/libc/sys/stack_protector.c +++ b/lib/libc/sys/stack_protector.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stack_protector.c,v 1.16 2015/01/16 16:48:51 deraadt Exp $ */ +/* $OpenBSD: stack_protector.c,v 1.17 2015/09/10 18:13:46 guenther Exp $ */ /* * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat. @@ -32,11 +32,8 @@ #include <syslog.h> #include <unistd.h> -void __stack_smash_handler(char func[], int damaged __attribute__((unused))); - -/*ARGSUSED*/ void -__stack_smash_handler(char func[], int damaged) +__stack_smash_handler(const char func[], int damaged) { struct syslog_data sdata = SYSLOG_DATA_INIT; const char message[] = "stack overflow in function %s"; @@ -61,3 +58,4 @@ __stack_smash_handler(char func[], int damaged) _exit(127); } +DEF_STRONG(__stack_smash_handler); diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c index 3f6bc25fec1..0f43580917c 100644 --- a/lib/libc/uuid/uuid_compare.c +++ b/lib/libc/uuid/uuid_compare.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_compare.c,v 1.2 2014/08/31 19:59:18 miod Exp $ */ +/* $OpenBSD: uuid_compare.c,v 1.3 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_compare.c,v 1.2 2008/04/23 07:52:32 plunky Exp $ */ /*- @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.6 2007/04/05 02:07:33 delphij Exp $ */ -#include "namespace.h" - #include <string.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c index ec255589057..c2a7e88679d 100644 --- a/lib/libc/uuid/uuid_create.c +++ b/lib/libc/uuid/uuid_create.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_create.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_create.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_create.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_create.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <stdlib.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c index caaaba5380b..05cdda061ad 100644 --- a/lib/libc/uuid/uuid_create_nil.c +++ b/lib/libc/uuid/uuid_create_nil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_create_nil.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_create_nil.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_create_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_create_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <string.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c index 2a853edd20d..e020c2bef9a 100644 --- a/lib/libc/uuid/uuid_equal.c +++ b/lib/libc/uuid/uuid_equal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_equal.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_equal.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_equal.c,v 1.2 2008/04/23 07:52:32 plunky Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_equal.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <string.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c index d9fe94d5f75..d8e2b5f9c29 100644 --- a/lib/libc/uuid/uuid_from_string.c +++ b/lib/libc/uuid/uuid_from_string.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_from_string.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_from_string.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_from_string.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_from_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <stdio.h> #include <string.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c index 6036f6c481a..3394124977e 100644 --- a/lib/libc/uuid/uuid_hash.c +++ b/lib/libc/uuid/uuid_hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_hash.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_hash.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_hash.c,v 1.2 2008/04/23 07:52:32 plunky Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_hash.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <uuid.h> /* diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c index 4de961233fd..70620950b4c 100644 --- a/lib/libc/uuid/uuid_is_nil.c +++ b/lib/libc/uuid/uuid_is_nil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_is_nil.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_is_nil.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_is_nil.c,v 1.4 2008/04/23 07:52:32 plunky Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_is_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <string.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c index 96c6e2def7c..97589a081f9 100644 --- a/lib/libc/uuid/uuid_stream.c +++ b/lib/libc/uuid/uuid_stream.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_stream.c,v 1.2 2014/08/31 19:58:53 miod Exp $ */ +/* $OpenBSD: uuid_stream.c,v 1.3 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $ */ /*- @@ -54,8 +54,6 @@ * $FreeBSD: src/sys/sys/endian.h,v 1.7 2010/05/20 06:16:13 phk Exp $ */ -#include "namespace.h" - #include <sys/types.h> #include <endian.h> #include <uuid.h> diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c index 8839fa44e2f..54e432873f6 100644 --- a/lib/libc/uuid/uuid_to_string.c +++ b/lib/libc/uuid/uuid_to_string.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uuid_to_string.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_to_string.c,v 1.2 2015/09/10 18:13:46 guenther Exp $ */ /* $NetBSD: uuid_to_string.c,v 1.2 2008/04/23 07:52:32 plunky Exp $ */ /* @@ -30,8 +30,6 @@ * $FreeBSD: src/lib/libc/uuid/uuid_to_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $ */ -#include "namespace.h" - #include <stdio.h> #include <string.h> #include <uuid.h> |