[Pkg-privacy-commits] [onioncat] 93/241: replace if_ether.h by ethernet.h

[Intrigeri]

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

intrigeri pushed a commit to branch upstream-master
in repository onioncat.

commit 7aebfe2a88e2189239ea995efa3670b8ffeb0dd4
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Wed Dec 10 10:59:54 2008 +0000

    replace if_ether.h by ethernet.h
    
    git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@384 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 config.h.in     | 6 +++---
 configure       | 2 +-
 configure.ac    | 2 +-
 src/ocat.h      | 7 +++++--
 src/ocateth.c   | 4 ++--
 src/ocatroute.c | 4 ++--
 src/ocattun.c   | 4 ++--
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/config.h.in b/config.h.in
index b538ba8..0fda4b9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,9 +21,6 @@
 /* Define to 1 if you have the <linux/sockios.h> header file. */
 #undef HAVE_LINUX_SOCKIOS_H
 
-/* Define to 1 if you have the <netinet/if_ether.h> header file. */
-#undef HAVE_NETINET_IF_ETHER_H
-
 /* Define to 1 if you have the <netinet/in6.h> header file. */
 #undef HAVE_NETINET_IN6_H
 
@@ -39,6 +36,9 @@
 /* Define to 1 if you have the <netinet/ip.h> header file. */
 #undef HAVE_NETINET_IP_H
 
+/* Define to 1 if you have the <net/ethernet.h> header file. */
+#undef HAVE_NET_ETHERNET_H
+
 /* Define to 1 if you have the <net/if.h> header file. */
 #undef HAVE_NET_IF_H
 
diff --git a/configure b/configure
index 71c207c..3e35072 100755
--- a/configure
+++ b/configure
@@ -3407,7 +3407,7 @@ fi
 
 
 
-for ac_header in sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h netinet/if_ether.h
+for ac_header in sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h net/ethernet.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/configure.ac b/configure.ac
index 616e6fa..40caa18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_CHECK_LIB([pthread], [pthread_create])
 # Checks for header files.
 #AC_HEADER_STDC
 #AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
-AC_CHECK_HEADERS([sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h netinet/if_ether.h], [], [],
+AC_CHECK_HEADERS([sys/types.h sys/socket.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/ip6.h netinet/in6.h net/if.h net/if_tun.h linux/if_tun.h linux/sockios.h endian.h sys/endian.h net/ethernet.h], [], [],
 [[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/ocat.h b/src/ocat.h
index e46c93a..e30b443 100644
--- a/src/ocat.h
+++ b/src/ocat.h
@@ -37,9 +37,12 @@
 #elif HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
 #endif
-#ifdef HAVE_NETINET_IF_ETHER_H
-#include <netinet/if_ether.h>
+#ifdef HAVE_NET_ETHERNET_H
+#include <net/ethernet.h>
 #endif
+//#ifdef HAVE_NETINET_IF_ETHER_H
+//#include <netinet/if_ether.h>
+//#endif
 #include <netinet/icmp6.h>
 #include <syslog.h>
 
diff --git a/src/ocateth.c b/src/ocateth.c
index 9702196..82da20e 100644
--- a/src/ocateth.c
+++ b/src/ocateth.c
@@ -49,9 +49,9 @@
 #endif
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
-#ifdef HAVE_NETINET_IF_ETHER_H
+/*#ifdef HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
-#endif
+#endif*/
 
 #include "ocat.h"
 
diff --git a/src/ocatroute.c b/src/ocatroute.c
index c5b8e39..819864f 100644
--- a/src/ocatroute.c
+++ b/src/ocatroute.c
@@ -48,9 +48,9 @@
 #ifdef HAVE_NETINET_IP_H
 #include <netinet/ip.h>
 #endif
-#ifdef HAVE_NETINET_IF_ETHER_H
+/*#ifdef HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
-#endif
+#endif*/
 
 #include "ocat.h"
 
diff --git a/src/ocattun.c b/src/ocattun.c
index a76b582..5e09543 100644
--- a/src/ocattun.c
+++ b/src/ocattun.c
@@ -46,9 +46,9 @@
 #ifdef HAVE_NET_IF_TUN_H
 #include <net/if_tun.h>
 #endif
-#ifdef HAVE_NETINET_IF_ETHER_H
+/*#ifdef HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
-#endif
+#endif*/
 
 #include "ocat.h"
 

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