diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:29:48 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:29:48 +0200 |
| commit | 7dc9956ce2388a5d5c89927941d7a4612d91b334 (patch) | |
| tree | 236476954d8cd8afc50ec8e730064bb9ac73e846 /hurd | |
| parent | 98b4e36ae609c9f3f791f2aef07b8cccf5f1218c (diff) | |
| parent | dc665715841aea049480d9f75ace426419db1f8e (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/Makefile | 7 | ||||
| -rw-r--r-- | hurd/hurdsock.c | 2 | ||||
| -rw-r--r-- | hurd/lookup-retry.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/hurd/Makefile b/hurd/Makefile index bdad4ff90b..321e04ef13 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002,2004,2006 +# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002,2004,2006,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -29,7 +29,7 @@ headers = hurd.h $(interface-headers) \ userlink.h resource.h threadvar.h lookup.h) inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \ - userlink.h threadvar.h port.h) + userlink.h threadvar.h port.h) # The RPC interfaces go in a separate library. interface-library := libhurduser @@ -67,12 +67,9 @@ dtable = dtable port2fd new-fd alloc-fd intern-fd \ getdport openport \ fd-close fd-read fd-write hurdioctl ctty-input ctty-output inlines = $(inline-headers:%.h=%-inlines) -distribute = hurdstartup.h hurdfault.h hurdhost.h \ - faultexc.defs intr-rpc.defs intr-rpc.h intr-msg.h Notes # XXX this is a temporary hack; see hurdmalloc.h routines += hurdmalloc -distribute += hurdmalloc.h # Binary compatibility for libc.so.0.2[GLIBC_2.0]. ifeq ($(versioning),yes) diff --git a/hurd/hurdsock.c b/hurd/hurdsock.c index 170a3f6185..f3611ecf27 100644 --- a/hurd/hurdsock.c +++ b/hurd/hurdsock.c @@ -22,7 +22,7 @@ #include <string.h> #include <hurd/paths.h> #include <stdio.h> -#include "stdio-common/_itoa.h" +#include <_itoa.h> #include <cthreads.h> /* For `struct mutex'. */ #include "hurdmalloc.h" /* XXX */ diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c index c65eb5ad57..3c506a043a 100644 --- a/hurd/lookup-retry.c +++ b/hurd/lookup-retry.c @@ -24,7 +24,7 @@ #include <limits.h> #include <fcntl.h> #include <string.h> -#include "stdio-common/_itoa.h" +#include <_itoa.h> /* Translate the error from dir_lookup into the error the user sees. */ static inline error_t |