luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtimezone: Avoid a nested preprocessor conditional to be nice to g-i

Browse Source 
GObject-Introspection seems to become confused by the nested conditional
followed by an `#elif` clause for the outer conditional, and issues
this warning:

.../gtimezone.c:830: mismatched #elif  defined (G_OS_WIN32)

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2023-02-10 13:16:01 +00:00
parent 30352032a6
commit ee223e8ec8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gtimezone.c
View File

@ -445,9 +445,7 @@ zone_for_constant_offset (GTimeZone *gtz, const gchar *name)
gtz->transitions = NULL; gtz->transitions = NULL;
} }
#ifdef G_OS_UNIX #if defined(G_OS_UNIX) && defined(__sun) && defined(__SVR4)
#if defined(__sun) && defined(__SVR4)
/* /*
* only used by Illumos distros or Solaris < 11: parse the /etc/default/init * only used by Illumos distros or Solaris < 11: parse the /etc/default/init
* text file looking for TZ= followed by the timezone, possibly quoted * text file looking for TZ= followed by the timezone, possibly quoted
@ -513,6 +511,7 @@ zone_identifier_illumos (void)
} }
#endif /* defined(__sun) && defined(__SRVR) */ #endif /* defined(__sun) && defined(__SRVR) */
#ifdef G_OS_UNIX
/* /*
* returns the path to the top of the Olson zoneinfo timezone hierarchy. * returns the path to the top of the Olson zoneinfo timezone hierarchy.
*/ */