Change in_addr_t default to jint

From-SVN: r28795

diff --git a/libjava/acconfig.h b/libjava/acconfig.h
index ca9627b32791f664feac35c32f4857f9ddfd8baa..26b34cbb9e593d3838972adf00874b3f098f23dc 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 b219d653bf8cc72079775e24f0cd319c361816e8..ef86b46f2e105c554bc0cc0a92ef2237ef5e0dbe 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -4462,7 +4462,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 e7818a8da4db71db0af930a87e5830ffdb0d1747..d4aa67e0a06918a4dd1e9ded02041f7853c27bb8 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -518,7 +518,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 2b6e95d1b596004279e6a7d92b6bb4f917b6019f..0c7ba29c4c0375821aa899b41880c182cb82e7a2 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.  */