[hurd] 05/08: New upstream snapshot

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 8bc09f8b03dad9a19f6fd2e70e8564b4b0e8b502
Author: Samuel Thibault <address@hidden>
Date:   Thu Jan 14 00:32:22 2016 +0000

    New upstream snapshot
---
 eth-multiplexer/Makefile                | 2 +-
 libbpf/Makefile                         | 2 +-
 libddekit/Makefile                      | 2 +-
 libmachdev/Makefile                     | 2 +-
 pfinet/linux-src/include/linux/skbuff.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eth-multiplexer/Makefile b/eth-multiplexer/Makefile
index bfd065a..8b392f4 100644
--- a/eth-multiplexer/Makefile
+++ b/eth-multiplexer/Makefile
@@ -27,7 +27,7 @@ 
device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
 OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
 LCLHDRS = ethernet.h util.h vdev.h netfs_impl.h
 HURDLIBS=ports fshelp shouldbeinlibc netfs bpf
-OTHERLIBS = -lpthread
+LDLIBS += -lpthread
 
 CFLAGS += -I$(top_srcdir)/libbpf
 
diff --git a/libbpf/Makefile b/libbpf/Makefile
index d6ebdc3..37189af 100644
--- a/libbpf/Makefile
+++ b/libbpf/Makefile
@@ -26,7 +26,7 @@ installhdrs = bpf_impl.h queue.h
 MIGSTUBS = 
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
 
-OTHERLIBS = -lpthread
+LDLIBS += -lpthread
 
 MIGCOMSFLAGS =
 
diff --git a/libddekit/Makefile b/libddekit/Makefile
index 59f7509..dcc4919 100644
--- a/libddekit/Makefile
+++ b/libddekit/Makefile
@@ -41,7 +41,7 @@ MIGSTUBS = experimentalUser.o
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
 
 HURDLIBS = ports shouldbeinlibc hurd-slab
-OTHERLIBS = -lpthread
+LDLIBS += -lpthread
 
 MIGCOMSFLAGS = -prefix dde_
 
diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index 7116c3e..b7cdd6b 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -27,7 +27,7 @@ LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \
          errno-base.h
 installhdrs = machdev.h
 HURDLIBS = ports trivfs bpf
-OTHERLIBS = -lpthread
+LDLIBS += -lpthread
 OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
 MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
 device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
diff --git a/pfinet/linux-src/include/linux/skbuff.h 
b/pfinet/linux-src/include/linux/skbuff.h
index 452cbda..427d1de 100644
--- a/pfinet/linux-src/include/linux/skbuff.h
+++ b/pfinet/linux-src/include/linux/skbuff.h
@@ -475,7 +475,7 @@ here:               ;
        return skb->data;
 }
 
-static __inline__ char *__skb_pull(struct sk_buff *skb, unsigned int len)
+static __inline__ unsigned char *__skb_pull(struct sk_buff *skb, unsigned int 
len)
 {
        skb->len-=len;
        return  skb->data+=len;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git