nsxivb28449e
fix: don't use reserved identifiers
identifiers beginning with an underscore is reserved by the C standard.
+9 −9
6 files changed
- M commands.h +1 −1
- M config.def.h +4 −4
- M image.c +1 −1
- M main.c +1 −1
- M thumbs.c +1 −1
- M window.c +1 −1
| @@ -44,7 +44,7 @@ bool ct_scroll(arg_t); | |||
| 44 | 44 | bool ct_drag_mark_image(arg_t); | |
| 45 | 45 | bool ct_select(arg_t); | |
| 46 | 46 | ||
| 47 | − | #ifdef _MAPPINGS_CONFIG | |
| 47 | + | #ifdef INCLUDE_MAPPINGS_CONFIG | |
| 48 | 48 | /* global */ | |
| 49 | 49 | #define g_change_gamma { cg_change_gamma, MODE_ALL } | |
| 50 | 50 | #define g_first { cg_first, MODE_ALL } | |
| @@ -1,4 +1,4 @@ | |||
| 1 | − | #ifdef _WINDOW_CONFIG | |
| 1 | + | #ifdef INCLUDE_WINDOW_CONFIG | |
| 2 | 2 | ||
| 3 | 3 | /* default window dimensions (overwritten via -g option): */ | |
| 4 | 4 | static const int WIN_WIDTH = 800; | |
| @@ -20,7 +20,7 @@ static const bool TOP_STATUSBAR = false; | |||
| 20 | 20 | #endif /* HAVE_LIBFONTS */ | |
| 21 | 21 | ||
| 22 | 22 | #endif | |
| 23 | − | #ifdef _IMAGE_CONFIG | |
| 23 | + | #ifdef INCLUDE_IMAGE_CONFIG | |
| 24 | 24 | ||
| 25 | 25 | /* levels (in percent) to use when zooming via '-' and '+': | |
| 26 | 26 | * (first/last value is used as min/max zoom level) | |
| @@ -62,7 +62,7 @@ static const int CACHE_SIZE_LIMIT = 256 * 1024 * 1024; /* but not above 256MiB | |||
| 62 | 62 | static const int CACHE_SIZE_FALLBACK = 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */ | |
| 63 | 63 | ||
| 64 | 64 | #endif | |
| 65 | − | #ifdef _THUMBS_CONFIG | |
| 65 | + | #ifdef INCLUDE_THUMBS_CONFIG | |
| 66 | 66 | ||
| 67 | 67 | /* thumbnail sizes in pixels (width == height): */ | |
| 68 | 68 | static const int thumb_sizes[] = { 32, 64, 96, 128, 160 }; | |
| @@ -71,7 +71,7 @@ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 }; | |||
| 71 | 71 | static const int THUMB_SIZE = 3; | |
| 72 | 72 | ||
| 73 | 73 | #endif | |
| 74 | − | #ifdef _MAPPINGS_CONFIG | |
| 74 | + | #ifdef INCLUDE_MAPPINGS_CONFIG | |
| 75 | 75 | ||
| 76 | 76 | /* these modifiers will be used when processing keybindings */ | |
| 77 | 77 | static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask; | |
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | */ | |
| 19 | 19 | ||
| 20 | 20 | #include "nsxiv.h" | |
| 21 | − | #define _IMAGE_CONFIG | |
| 21 | + | #define INCLUDE_IMAGE_CONFIG | |
| 22 | 22 | #include "config.h" | |
| 23 | 23 | ||
| 24 | 24 | #include <errno.h> | |
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | */ | |
| 19 | 19 | ||
| 20 | 20 | #include "nsxiv.h" | |
| 21 | − | #define _MAPPINGS_CONFIG | |
| 21 | + | #define INCLUDE_MAPPINGS_CONFIG | |
| 22 | 22 | #include "commands.h" | |
| 23 | 23 | #include "config.h" | |
| 24 | 24 | ||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | */ | |
| 19 | 19 | ||
| 20 | 20 | #include "nsxiv.h" | |
| 21 | − | #define _THUMBS_CONFIG | |
| 21 | + | #define INCLUDE_THUMBS_CONFIG | |
| 22 | 22 | #include "config.h" | |
| 23 | 23 | ||
| 24 | 24 | #include <errno.h> | |
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | */ | |
| 19 | 19 | ||
| 20 | 20 | #include "nsxiv.h" | |
| 21 | − | #define _WINDOW_CONFIG | |
| 21 | + | #define INCLUDE_WINDOW_CONFIG | |
| 22 | 22 | #include "config.h" | |
| 23 | 23 | #include "icon/data.h" | |
| 24 | 24 | ||