diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 07:52:05 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 07:52:05 -0700 |
| commit | a3abe794b734382295b89d6c2d1d176ce4bb9b4b (patch) | |
| tree | 95e345dd609035922e9beeb9e22ec11cdc6308aa /android/utils/timezone.c | |
| parent | 2a7dcd0aef9ff770f4a215d2195d509763f6d3ce (diff) | |
| parent | 63a13ab8230560f5b9610bb0fa6a47a54ebf8e9c (diff) | |
| download | external_qemu-a3abe794b734382295b89d6c2d1d176ce4bb9b4b.zip external_qemu-a3abe794b734382295b89d6c2d1d176ce4bb9b4b.tar.gz external_qemu-a3abe794b734382295b89d6c2d1d176ce4bb9b4b.tar.bz2 | |
merge from open-source master
Diffstat (limited to 'android/utils/timezone.c')
| -rw-r--r-- | android/utils/timezone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/utils/timezone.c b/android/utils/timezone.c index b5588a3..f4b78db 100644 --- a/android/utils/timezone.c +++ b/android/utils/timezone.c @@ -96,7 +96,7 @@ bufprint_zoneinfo_timezone( char* p, char* end ) /* on OS X, the timezone directory is always /usr/share/zoneinfo * this makes things easy. */ -#ifdef __APPLE__ +#if defined(__APPLE__) #include <unistd.h> #include <limits.h> @@ -149,7 +149,7 @@ get_zoneinfo_timezone( void ) * the original timezone file. the only way to know which zoneinfo name to retrieve is to compare * it with all files in $TZDIR (at least those that match Area/Location or Area/Location/SubLocation */ -#ifdef __linux__ +#if defined(__linux__) || defined (__FreeBSD__) #include <unistd.h> #include <limits.h> |