From cc38cb359fc4966cbd7616cac0bf867a31762235 Mon Sep 17 00:00:00 2001 From: Daniel Macks Date: Tue, 10 Jun 2014 13:43:27 -0400 Subject: [PATCH] Convert multiple #if/#endif to single #if/#elif/#endif https://bugzilla.gnome.org/show_bug.cgi?id=731424 --- glib/gutils.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/glib/gutils.c b/glib/gutils.c index 526ccb2..e89f028 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1402,9 +1402,8 @@ load_user_special_dirs (void) g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = find_folder (kMovieDocumentsFolderType); } -#endif /* HAVE_CARBON */ +#elif defined(G_OS_WIN32) -#if defined(G_OS_WIN32) static void load_user_special_dirs (void) { @@ -1472,10 +1471,8 @@ load_user_special_dirs (void) g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = get_special_folder (CSIDL_TEMPLATES); g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = get_special_folder (CSIDL_MYVIDEO); } -#endif /* G_OS_WIN32 */ - -#if defined(G_OS_UNIX) && !defined(HAVE_CARBON) +#else /* default is unix */ /* adapted from xdg-user-dir-lookup.c * @@ -1630,7 +1627,7 @@ load_user_special_dirs (void) g_free (config_file); } -#endif /* G_OS_UNIX && !HAVE_CARBON */ +#endif /* platform-specific load_user_special_dirs implementations */ /** -- 2.7.4