diff options
| author | Frédéric Crozat <fcrozat@src.gnome.org> | 2003-06-15 15:03:15 +0000 |
|---|---|---|
| committer | Frédéric Crozat <fcrozat@src.gnome.org> | 2003-06-15 15:03:15 +0000 |
| commit | d1f826a9049703e682d5afb8d06ea297b6a2e110 (patch) | |
| tree | 5a9d5edc6235fbc4efcb7d8af1593d74c839957f /libnautilus-private | |
| parent | fa1c41e9009b55cc07a7bb53e43f8ee6f008fee8 (diff) | |
| download | nautilus-d1f826a9049703e682d5afb8d06ea297b6a2e110.tar.gz | |
Remove -Wsign-promo and add -Wno-strict-aliasing to the list of options to
* configure.in:
Remove -Wsign-promo and add -Wno-strict-aliasing to the list
of options to test for. Fixes the gcc 3.3 aliasing warnings.
* libnautilus-private/nautilus-file.c:
(nautilus_file_compare_for_sort_internal):
* libnautilus-private/nautilus-icon-factory.c:
(nautilus_get_icon_size_for_zoom_level):
gcc 3.3 doesn't like g_return_val_if_fail (FALSE, ...).
Use g_return_val_if_reached instead.
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 6515c3eb1..2fa3fc1bf 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -2015,7 +2015,7 @@ nautilus_file_compare_for_sort_internal (NautilusFile *file_1, } return compare_by_full_path (file_1, file_2); default: - g_return_val_if_fail (FALSE, 0); + g_return_val_if_reached (0); } } diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index a85d77cc0..c9e40b736 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -1423,7 +1423,7 @@ nautilus_get_icon_size_for_zoom_level (NautilusZoomLevel zoom_level) case NAUTILUS_ZOOM_LEVEL_LARGEST: return NAUTILUS_ICON_SIZE_LARGEST; } - g_return_val_if_fail (FALSE, NAUTILUS_ICON_SIZE_STANDARD); + g_return_val_if_reached (NAUTILUS_ICON_SIZE_STANDARD); } /* Convenience cover for nautilus_icon_factory_get_icon_for_file |