--- jdk.old/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java +++ jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java @@ -283,9 +283,11 @@ checkCurrencyCode(newCurrency); String timeString = currencyInfo.substring(4, length - 4); long time = format.parse(timeString).getTime(); - if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { - throw new RuntimeException("time is more than 10 years from present: " + time); - } + +// if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +// throw new RuntimeException("time is more than 10 years from present: " + time); +// } + specialCaseCutOverTimes[specialCaseCount] = time; specialCaseOldCurrencies[specialCaseCount] = oldCurrency; specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); --- jdk.old/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c +++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c @@ -28,6 +28,9 @@ #include #include "NativeFunc.h" +/* global GSS function table */ +GSS_FUNCTION_TABLE_PTR ftab; + /* standard GSS method names (ordering is from mapfile) */ static const char RELEASE_NAME[] = "gss_release_name"; static const char IMPORT_NAME[] = "gss_import_name"; --- jdk.old/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h +++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h @@ -265,6 +265,6 @@ typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; /* global GSS function table */ -GSS_FUNCTION_TABLE_PTR ftab; +extern GSS_FUNCTION_TABLE_PTR ftab; #endif --- jdk.old/src/solaris/native/java/lang/childproc.h +++ jdk/src/solaris/native/java/lang/childproc.h @@ -119,7 +119,7 @@ * The cached and split version of the JDK's effective PATH. * (We don't support putenv("PATH=...") in native code) */ -const char * const *parentPathv; +extern const char * const *parentPathv; ssize_t restartableWrite(int fd, const void *buf, size_t count); int restartableDup2(int fd_from, int fd_to); --- jdk.old/src/solaris/native/java/lang/childproc.c +++ jdk/src/solaris/native/java/lang/childproc.c @@ -33,6 +33,7 @@ #include "childproc.h" +const char * const *parentPathv; ssize_t restartableWrite(int fd, const void *buf, size_t count) --- jdk.old/src/solaris/native/sun/awt/gtk2_interface.c +++ jdk/src/solaris/native/sun/awt/gtk2_interface.c @@ -35,6 +35,9 @@ #include #include "awt.h" +guchar *(*fp_gdk_pixbuf_get_pixels)(const GdkPixbuf *pixbuf); +int (*fp_gdk_pixbuf_get_rowstride)(const GdkPixbuf *pixbuf); + #define GTK2_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0") #define GTK2_LIB JNI_LIB_NAME("gtk-x11-2.0") #define GTHREAD_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gthread-2.0", "0") --- jdk.old/src/solaris/native/sun/awt/gtk2_interface.h +++ jdk/src/solaris/native/sun/awt/gtk2_interface.h @@ -770,11 +770,11 @@ void (*fp_g_free)(gpointer mem); void (*fp_g_object_unref)(gpointer object); int (*fp_gdk_pixbuf_get_bits_per_sample)(const GdkPixbuf *pixbuf); -guchar *(*fp_gdk_pixbuf_get_pixels)(const GdkPixbuf *pixbuf); +extern guchar *(*fp_gdk_pixbuf_get_pixels)(const GdkPixbuf *pixbuf); gboolean (*fp_gdk_pixbuf_get_has_alpha)(const GdkPixbuf *pixbuf); int (*fp_gdk_pixbuf_get_height)(const GdkPixbuf *pixbuf); int (*fp_gdk_pixbuf_get_n_channels)(const GdkPixbuf *pixbuf); -int (*fp_gdk_pixbuf_get_rowstride)(const GdkPixbuf *pixbuf); +extern int (*fp_gdk_pixbuf_get_rowstride)(const GdkPixbuf *pixbuf); int (*fp_gdk_pixbuf_get_width)(const GdkPixbuf *pixbuf); GdkPixbuf *(*fp_gdk_pixbuf_new_from_file)(const char *filename, GError **error); void (*fp_gtk_widget_destroy)(GtkWidget *widget);