From c55d29ff119598a410e714ef36f47fb6626a1a7a Mon Sep 17 00:00:00 2001 From: Jiangli Zhou Date: Thu, 27 Jul 2023 19:12:46 +0000 Subject: [PATCH] 8312626: Resolve multiple definition of 'start_timer' when statically linking JDK native libraries with user code Reviewed-by: serb --- .../share/native/libawt/awt/medialib/awt_ImagingLib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c b/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c index 28da681aa97..7e382eec175 100644 --- a/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c +++ b/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c @@ -187,8 +187,8 @@ static int setPackedICRdefault(JNIEnv *env, RasterS_t *rasterP, int component, unsigned char *outDataP, int supportsAlpha); -mlib_start_timer start_timer = NULL; -mlib_stop_timer stop_timer = NULL; +static mlib_start_timer start_timer = NULL; +static mlib_stop_timer stop_timer = NULL; /*************************************************************************** * Debugging Definitions *