From 96312505fb362c99a50c95d694d3710bdebef4b1 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 15 May 2013 06:59:46 +0200
Subject: Fix merge error in NetworkInterface.c

Need to squash this later.
---
 debian/patches/kfreebsd-support-jdk.diff | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/debian/patches/kfreebsd-support-jdk.diff b/debian/patches/kfreebsd-support-jdk.diff
index 6721da7..fc270aa 100644
--- a/debian/patches/kfreebsd-support-jdk.diff
+++ b/debian/patches/kfreebsd-support-jdk.diff
@@ -2325,3 +2325,63 @@ index 25973d9..3fd1f3f 100644
 -- 
 1.7.10.4
 
+--- openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2013-05-13 22:15:57.256306117 +0200
++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c	2013-05-13 22:25:08.558318954 +0200
+@@ -56,7 +56,7 @@
+ #define _PATH_PROCNET_IFINET6           "/proc/net/if_inet6"
+ #endif
+ 
+-#if defined(_ALLBSD_SOURCE)
++#if defined(_ALLBSD_SOURCE) || defined(__FreeBSD_kernel__)
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/sockio.h>
+@@ -69,17 +69,6 @@
+ #endif
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#include <sys/param.h>
+-#include <sys/ioctl.h>
+-#include <sys/sockio.h>
+-#include <net/ethernet.h>
+-#include <net/if_var.h>
+-#include <net/if_dl.h>
+-#include <netinet/in_var.h>
+-#include <ifaddrs.h>
+-#endif
+-
+ #include "jvm.h"
+ #include "jni_util.h"
+ #include "net_util.h"
+@@ -1180,11 +1169,7 @@
+         return -1;
+     }
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-    return if2.ifr_index;
+-#else
+     return if2.ifr_ifindex;
+-#endif
+ }
+ 
+ /**
+@@ -1686,7 +1671,7 @@
+ }
+ 
+ /** BSD **/
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#ifdef _ALLBSD_SOURCE || defined(__FreeBSD_kernel__)
+ /* Open socket for further ioct calls, try v4 socket first and
+  * if it falls return v6 socket
+  */
+@@ -1986,9 +1971,6 @@
+ 
+ #endif
+ 
+-
+-/** BSD **/
+-#ifdef _ALLBSD_SOURCE
+ /* Open socket for further ioct calls, try v4 socket first and
+  * if it falls return v6 socket
+  */
-- 
cgit v1.2.3