Mercurial > hg > release > icedtea6-1.7

changeset 1710:419024238732

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-09-15 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/cpu/zero/vm/jni_zero.h (jlong): Altered definition on 64-bit platforms.
author Gary Benson <gbenson@redhat.com>
date Tue, 15 Sep 2009 07:54:59 -0400
parents 524b551b6a8a
children 260b65087a73
files ChangeLog ports/hotspot/src/cpu/zero/vm/jni_zero.h
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Sep 15 06:02:32 2009 -0400
+++ b/ChangeLog	Tue Sep 15 07:54:59 2009 -0400
@@ -1,3 +1,8 @@
+2009-09-15  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/jni_zero.h
+	(jlong): Altered definition on 64-bit platforms.
+
 2009-09-15  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp:
--- a/ports/hotspot/src/cpu/zero/vm/jni_zero.h	Tue Sep 15 06:02:32 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/jni_zero.h	Tue Sep 15 07:54:59 2009 -0400
@@ -1,5 +1,6 @@
 /*
  * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,5 +29,10 @@
 #define JNICALL
 
 typedef int jint;
+typedef signed char jbyte;
+
+#ifdef _LP64
+typedef long jlong;
+#else
 typedef long long jlong;
-typedef signed char jbyte;
+#endif