diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /libnetfs | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libnetfs')
| -rw-r--r-- | libnetfs/Makefile | 4 | ||||
| -rw-r--r-- | libnetfs/priv.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libnetfs/Makefile b/libnetfs/Makefile index d6a991df..33ee2fb2 100644 --- a/libnetfs/Makefile +++ b/libnetfs/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2008 Free Software +# Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2008, 2012 Free Software # Foundation # # Written by Michael I. Bushnell. @@ -56,7 +55,6 @@ OTHERSRCS= drop-node.c init-init.c make-node.c make-peropen.c make-protid.c \ SRCS= $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(IFSOCKSRCS) -LCLHDRS = netfs.h callbacks.h misc.h modes.h mutations.h priv.h execserver.h installhdrs=netfs.h MIGSTUBS= ioServer.o fsServer.o fsysServer.o fsys_replyUser.o ifsockServer.o diff --git a/libnetfs/priv.h b/libnetfs/priv.h index b0f9f4a0..00db9faa 100644 --- a/libnetfs/priv.h +++ b/libnetfs/priv.h @@ -18,6 +18,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ +#ifndef _LIBNETFS_PRIV_H +#define _LIBNETFS_PRIV_H + #include <hurd/hurd_types.h> #include "netfs.h" @@ -34,3 +37,4 @@ end_using_protid_port (struct protid *cred) if (cred) ports_port_deref (cred); } +#endif |