Change in_addr_t default to jint

From-SVN: r28796

diff --git a/libjava/acconfig.h b/libjava/acconfig.h
index d19be8dc9a0e56a25c0ac7cb8268664358cf7772..63119e2716a08f6503b7017509e4d4cb472ad884 100644 (file)
--- a/libjava/acconfig.h
+++ b/libjava/acconfig.h
@@ -58,7 +58,7 @@
 /* Define to `int' if `ssize_t' is not defined.  */
 #undef ssize_t
 
-/* Define to `struct in_addr' if `in_addr_t' is not defined.  */
+/* Define to `jint' if `in_addr_t' is not defined.  */
 #undef in_addr_t
 
 /* Define if inet6 structures are defined in netinet/in.h.  */

diff --git a/libjava/configure b/libjava/configure
index 8afb79f05f3358c55150ac8cc84c2d08ac7e35b8..4c0363db3ac37113ea9cba99064b9bd5a0a4f24c 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -4497,7 +4497,7 @@ fi
 echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6
 if test $ac_cv_type_in_addr_t = no; then
   cat >> confdefs.h <<\EOF
-#define in_addr_t struct in_addr
+#define in_addr_t jint
 EOF
 
 fi

diff --git a/libjava/configure.in b/libjava/configure.in
index b48625c34891f9e88c457c2f0d7d39346cb9f1de..51839d3bb631eb516f116a47dfb22eccfb48851b 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -547,7 +547,7 @@ dnl for now.  If you change this, you also must update natFile.cc.
 AC_CHECK_HEADERS(dirent.h)
 
 AC_CHECK_TYPE([ssize_t], [int])
-AC_CHECK_TYPE([in_addr_t], [struct in_addr])
+AC_CHECK_TYPE([in_addr_t], [jint])
 
 AC_MSG_CHECKING([whether struct sockaddr_in6 is in netinet/in.h])
 AC_TRY_COMPILE([#include <netinet/in.h>], [struct sockaddr_in6 addr6;],

diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in
index 997f596a7731ffb8a06c6890f56f0e229c601be5..11599c43334af119f9c39354a7cf6cd17e165805 100644 (file)
--- a/libjava/include/config.h.in
+++ b/libjava/include/config.h.in
@@ -73,7 +73,7 @@
 /* Define to `int' if `ssize_t' is not defined.  */
 #undef ssize_t
 
-/* Define to `struct in_addr' if `in_addr_t' is not defined.  */
+/* Define to `jint' if `in_addr_t' is not defined.  */
 #undef in_addr_t
 
 /* Define if inet6 structures are defined in netinet/in.h.  */