changeset 4686:4b5540e8d2d9

. Fix merge botches to get *BSD working again.
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 04 Mar 2012 16:17:02 -0800
parents b0641c559aa1
children acbecd3d359a
files src/solaris/native/java/util/TimeZone_md.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/native/java/util/TimeZone_md.c	Sun Feb 26 16:05:10 2012 -0800
+++ b/src/solaris/native/java/util/TimeZone_md.c	Sun Mar 04 16:17:02 2012 -0800
@@ -127,7 +127,7 @@
         return NULL;
     }
 
-#if defined(__linux__) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
+#if defined(__linux__) || defined(_ALLBSD_SOURCE) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
                                                     defined(_LP64)))
     while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
 #else
@@ -216,7 +216,7 @@
     return tz;
 }
 
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
 
 /*
  * Performs Linux specific mapping and returns a zone ID
@@ -269,7 +269,6 @@
     strncpy(zoneinfo_file, DEFAULT_ZONEINFO_FILE, PATH_MAX);
     zoneinfo_file[PATH_MAX] = '\0';
 
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
     /*
      * If it's a symlink, get the link name and its zone ID part. (The
      * older versions of timeconfig created a symlink as described in
@@ -296,7 +295,6 @@
 	    }
         }
     }
-#endif /* __linux__ || _ALLBSD_SOURCE */
 
     /*
      * If it's a regular file, we need to find out the same zoneinfo file
@@ -621,7 +619,7 @@
     return tz;
 }
 #endif /*__solaris__*/
-#endif /*__linux__*/
+#endif /* __linux__ || _ALLBSD_SOURCE */
 
 /*
  * findJavaTZ_md() maps platform time zone ID to Java time zone ID