From e20948ca20e7077daecae7ea015112f5a2324307 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Tue, 3 Sep 2024 09:21:45 +0200 Subject: [PATCH] TimeZone_md move platform stuff --- src/java.base/unix/native/libjava/TimeZone_md.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/java.base/unix/native/libjava/TimeZone_md.c b/src/java.base/unix/native/libjava/TimeZone_md.c index 92d1314c330be..bc55f099bd95a 100644 --- a/src/java.base/unix/native/libjava/TimeZone_md.c +++ b/src/java.base/unix/native/libjava/TimeZone_md.c @@ -57,13 +57,8 @@ static const char *DEFAULT_ZONEINFO_FILE = "/usr/share/lib/zoneinfo/localtime"; static const char popularZones[][4] = {"UTC", "GMT"}; -#if defined(_AIX) -static const char *ETC_ENVIRONMENT_FILE = "/etc/environment"; -#else -static char *isFileIdentical(char* buf, size_t size, char *pathname); -#endif - #if defined(__linux__) || defined(MACOSX) +static char *isFileIdentical(char* buf, size_t size, char *pathname); /* * remove repeated path separators ('/') in the given 'path'. @@ -356,6 +351,7 @@ getPlatformTimeZoneID() } #elif defined(_AIX) +static const char *ETC_ENVIRONMENT_FILE = "/etc/environment"; static char * getPlatformTimeZoneID()