luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert multiple #if/#endif to single #if/#elif/#endif

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=731424
This commit is contained in:
Daniel Macks 2014-06-10 13:43:27 -04:00 committed by Matthias Clasen
parent ab9f63fadd
commit cc38cb359f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/gutils.c
View File

@ -1402,9 +1402,8 @@ load_user_special_dirs (void)
g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = find_folder (kMovieDocumentsFolderType); 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 static void
load_user_special_dirs (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_TEMPLATES] = get_special_folder (CSIDL_TEMPLATES);
g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = get_special_folder (CSIDL_MYVIDEO); g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = get_special_folder (CSIDL_MYVIDEO);
} }
#endif /* G_OS_WIN32 */
#else /* default is unix */
#if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
/* adapted from xdg-user-dir-lookup.c /* adapted from xdg-user-dir-lookup.c
* *
@ -1630,7 +1627,7 @@ load_user_special_dirs (void)
g_free (config_file); g_free (config_file);
} }
#endif /* G_OS_UNIX && !HAVE_CARBON */ #endif /* platform-specific load_user_special_dirs implementations */
/** /**