[kaffe] CVS kaffe (guilhem): Fixes for Solaris.

[Kaffe CVS]

PatchSet 4980 
Date: 2004/07/17 13:55:59
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fixes for Solaris.

        * configure.ac: Added a new test to check whether tm_zone exists in
        struct tm.

        * config/config.h.in, configure: Regenerated.

        * kaffe/kaffevm/jit/labels.c: Move '*/' to make gcc happy.

Members: 
	ChangeLog:1.2544->1.2545 
	configure:1.355->1.356 
	configure.ac:1.53->1.54 
	config/config.h.in:1.117->1.118 
	kaffe/kaffevm/jit/labels.c:1.10->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2544 kaffe/ChangeLog:1.2545
--- kaffe/ChangeLog:1.2544	Sat Jul 17 09:04:09 2004
+++ kaffe/ChangeLog	Sat Jul 17 13:55:59 2004
@@ -1,5 +1,14 @@
 2004-07-17  Guilhem Lavaux <guilhem at kaffe.org>
 
+	* configure.ac: Added a new test to check whether tm_zone exists in
+	struct tm.
+
+	* config/config.h.in, configure: Regenerated.
+
+	* kaffe/kaffevm/jit/labels.c: Move '*/' to make gcc happy.
+
+2004-07-17  Guilhem Lavaux <guilhem at kaffe.org>
+
 	* libraries/javalib/java/text/CollationElementIterator.java:
 	Use ArrayList instead of Vector.
 	
Index: kaffe/configure
diff -u kaffe/configure:1.355 kaffe/configure:1.356
--- kaffe/configure:1.355	Sat Jul 17 07:56:54 2004
+++ kaffe/configure	Sat Jul 17 13:56:00 2004
@@ -52516,6 +52516,74 @@
 fi
 
 
+echo "$as_me:$LINENO: checking for declaration of tm_zone in struct tm" >&5
+echo $ECHO_N "checking for declaration of tm_zone in struct tm... $ECHO_C" >&6
+if test "${ac_cv_declared_tm_zone+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+int
+main ()
+{
+ struct tm conftime; conftime.tm_zone = NULL;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_declared_tm_zone=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_declared_tm_zone=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_declared_tm_zone" >&5
+echo "${ECHO_T}$ac_cv_declared_tm_zone" >&6
+
+if test x"$ac_cv_declared_tm_zone" = x"yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECLARED_TM_ZONE 1
+_ACEOF
+
+fi
+
+
 
 echo "$as_me:$LINENO: checking for declaration of select" >&5
 echo $ECHO_N "checking for declaration of select... $ECHO_C" >&6
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.53 kaffe/configure.ac:1.54
--- kaffe/configure.ac:1.53	Sat Jul 17 07:57:05 2004
+++ kaffe/configure.ac	Sat Jul 17 13:56:03 2004
@@ -1500,6 +1500,25 @@
 dnl -------------------------------------------------------------------------
 
 dnl =========================================================================
+dnl Work out if struct tm contains tm_zone
+dnl -------------------------------------------------------------------------
+AC_CACHE_CHECK([for declaration of tm_zone in struct tm],
+  ac_cv_declared_tm_zone,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+]], [[ struct tm conftime; conftime.tm_zone = NULL; ]])],
+    [ac_cv_declared_tm_zone=yes],
+    [ac_cv_declared_tm_zone=no])
+])
+
+if test x"$ac_cv_declared_tm_zone" = x"yes"; then
+   AC_DEFINE(HAVE_DECLARED_TM_ZONE, 1, [Is tm_zone declared in struct tm ?])
+fi
+
+
+dnl =========================================================================
 dnl Work out if select is declared
 dnl -------------------------------------------------------------------------
 
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.117 kaffe/config/config.h.in:1.118
--- kaffe/config/config.h.in:1.117	Fri Jul 16 16:20:51 2004
+++ kaffe/config/config.h.in	Sat Jul 17 13:56:07 2004
@@ -77,6 +77,9 @@
 /* Is function swab declared */
 #undef HAVE_DECLARED_SWAB
 
+/* Is tm_zone declared in struct tm ? */
+#undef HAVE_DECLARED_TM_ZONE
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
Index: kaffe/kaffe/kaffevm/jit/labels.c
diff -u kaffe/kaffe/kaffevm/jit/labels.c:1.10 kaffe/kaffe/kaffevm/jit/labels.c:1.11
--- kaffe/kaffe/kaffevm/jit/labels.c:1.10	Thu Jul 15 14:44:05 2004
+++ kaffe/kaffe/kaffevm/jit/labels.c	Sat Jul 17 13:56:07 2004
@@ -219,8 +219,8 @@
 				*lptr = curr->next;
 				retval = curr;
 			}
-			break;
 		  */
+			break;
 		}
 		curr = curr->next;
 	}