6 files changed, 32 insertions, 12 deletions
diff --git a/contrib/libpcap/lbl/os-aix7.h b/contrib/libpcap/lbl/os-aix7.h
new file mode 100644
index 000000000000..93b12f2d267e
--- /dev/null
+++ b/contrib/libpcap/lbl/os-aix7.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 1993, 1994, 1995, 1996, 1997
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/* Prototypes missing in AIX 7.x */
+int	ffs(int i);
diff --git a/contrib/libpcap/lbl/os-osf4.h b/contrib/libpcap/lbl/os-osf4.h
index 6b87bc055c29..055eb80ac623 100644
--- a/contrib/libpcap/lbl/os-osf4.h
+++ b/contrib/libpcap/lbl/os-osf4.h
@@ -20,7 +20,7 @@
  */
 
 /* Prototypes missing in Digital UNIX 4.x */
-int	snprintf(char *, size_t, const char *, ...);
-int	vsnprintf(char *, size_t, const char *, va_list);
+int	pcap_snprintf(char *, size_t, const char *, ...);
+int	pcap_vsnprintf(char *, size_t, const char *, va_list);
 int	pfopen(char *, int);
-   
+
diff --git a/contrib/libpcap/lbl/os-osf5.h b/contrib/libpcap/lbl/os-osf5.h
index 4c73c69f4a71..5422f18f18a1 100644
--- a/contrib/libpcap/lbl/os-osf5.h
+++ b/contrib/libpcap/lbl/os-osf5.h
@@ -21,10 +21,10 @@
 
 /*
  * Prototypes missing in Tru64 UNIX 5.x
- * XXX - "snprintf()" and "vsnprintf()" aren't missing, but you have to
+ * XXX - "pcap_snprintf()" and "pcap_vsnprintf()" aren't missing, but you have to
  * #define the right value to get them defined by <stdio.h>.
  */
-int	snprintf(char *, size_t, const char *, ...);
-int	vsnprintf(char *, size_t, const char *, va_list);
+int	pcap_snprintf(char *, size_t, const char *, ...);
+int	pcap_vsnprintf(char *, size_t, const char *, va_list);
 int	pfopen(char *, int);
-   
+
diff --git a/contrib/libpcap/lbl/os-solaris2.h b/contrib/libpcap/lbl/os-solaris2.h
index 22948b4a2695..a555f5ed3147 100644
--- a/contrib/libpcap/lbl/os-solaris2.h
+++ b/contrib/libpcap/lbl/os-solaris2.h
@@ -21,4 +21,4 @@
 
 /* Prototypes missing in SunOS 5 */
 char    *strerror(int);
-int	snprintf(char *, size_t, const char *, ...);
+int	pcap_snprintf(char *, size_t, const char *, ...);
diff --git a/contrib/libpcap/lbl/os-sunos4.h b/contrib/libpcap/lbl/os-sunos4.h
index b73585706cd5..6353fb09cf6e 100644
--- a/contrib/libpcap/lbl/os-sunos4.h
+++ b/contrib/libpcap/lbl/os-sunos4.h
@@ -65,7 +65,6 @@ int	fchmod(int, int);
 int	fchown(int, int, int);
 void	endgrent(void);
 void	endpwent(void);
-void	endservent(void);
 #ifdef __STDC__
 struct	ether_addr;
 #endif
@@ -146,7 +145,6 @@ int	select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 int	setpgrp(int, int);
 void	setpwent(void);
 int	setrlimit(int, struct rlimit *);
-void	setservent(int);
 int	setsockopt(int, int, int, char *, int);
 int	shutdown(int, int);
 int	sigblock(int);
@@ -157,7 +155,7 @@ int	sigsetmask(int);
 struct	sigvec;
 #endif
 int	sigvec(int, struct sigvec *, struct sigvec*);
-int	snprintf(char *, size_t, const char *, ...);
+int	pcap_snprintf(char *, size_t, const char *, ...);
 int	socket(int, int, int);
 int	socketpair(int, int, int, int *);
 int	symlink(const char *, const char *);
diff --git a/contrib/libpcap/lbl/os-ultrix4.h b/contrib/libpcap/lbl/os-ultrix4.h
index fa1f770f8d44..21e570234bef 100644
--- a/contrib/libpcap/lbl/os-ultrix4.h
+++ b/contrib/libpcap/lbl/os-ultrix4.h
@@ -23,7 +23,6 @@
 int	bcmp(const char *, const char *, u_int);
 void	bcopy(const void *, void *, u_int);
 void	bzero(void *, u_int);
-void	endservent(void);
 int	getopt(int, char * const *, const char *);
 #ifdef __STDC__
 struct timeval;