Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't use reserved identifiers

Browse Source 
identifiers beginning with an underscore is reserved by the C standard.
This commit is contained in:
NRK 2022-06-15 13:42:34 +06:00 committed by Gitea
parent f23d57d4ad
commit b28449e10c
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands.h
View File

@ -44,7 +44,7 @@ bool ct_scroll(arg_t);
bool ct_drag_mark_image(arg_t); bool ct_drag_mark_image(arg_t);
bool ct_select(arg_t); bool ct_select(arg_t);
#ifdef _MAPPINGS_CONFIG #ifdef INCLUDE_MAPPINGS_CONFIG
/* global */ /* global */
#define g_change_gamma { cg_change_gamma, MODE_ALL } #define g_change_gamma { cg_change_gamma, MODE_ALL }
#define g_first { cg_first, MODE_ALL } #define g_first { cg_first, MODE_ALL }

8
config.def.h
View File

@ -1,4 +1,4 @@
#ifdef _WINDOW_CONFIG #ifdef INCLUDE_WINDOW_CONFIG
/* default window dimensions (overwritten via -g option): */ /* default window dimensions (overwritten via -g option): */
static const int WIN_WIDTH = 800; static const int WIN_WIDTH = 800;
@ -20,7 +20,7 @@ static const bool TOP_STATUSBAR = false;
#endif /* HAVE_LIBFONTS */ #endif /* HAVE_LIBFONTS */
#endif #endif
#ifdef _IMAGE_CONFIG #ifdef INCLUDE_IMAGE_CONFIG
/* levels (in percent) to use when zooming via '-' and '+': /* levels (in percent) to use when zooming via '-' and '+':
* (first/last value is used as min/max zoom level) * (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
static const int CACHE_SIZE_FALLBACK = 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */ static const int CACHE_SIZE_FALLBACK = 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */
#endif #endif
#ifdef _THUMBS_CONFIG #ifdef INCLUDE_THUMBS_CONFIG
/* thumbnail sizes in pixels (width == height): */ /* thumbnail sizes in pixels (width == height): */
static const int thumb_sizes[] = { 32, 64, 96, 128, 160 }; static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
@ -71,7 +71,7 @@ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
static const int THUMB_SIZE = 3; static const int THUMB_SIZE = 3;
#endif #endif
#ifdef _MAPPINGS_CONFIG #ifdef INCLUDE_MAPPINGS_CONFIG
/* these modifiers will be used when processing keybindings */ /* these modifiers will be used when processing keybindings */
static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask; static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask;

2
image.c
View File

@ -18,7 +18,7 @@
*/ */
#include "nsxiv.h" #include "nsxiv.h"
#define _IMAGE_CONFIG #define INCLUDE_IMAGE_CONFIG
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>

2
main.c
View File

@ -18,7 +18,7 @@
*/ */
#include "nsxiv.h" #include "nsxiv.h"
#define _MAPPINGS_CONFIG #define INCLUDE_MAPPINGS_CONFIG
#include "commands.h" #include "commands.h"
#include "config.h" #include "config.h"

2
thumbs.c
View File

@ -18,7 +18,7 @@
*/ */
#include "nsxiv.h" #include "nsxiv.h"
#define _THUMBS_CONFIG #define INCLUDE_THUMBS_CONFIG
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>

2
window.c
View File

@ -18,7 +18,7 @@
*/ */
#include "nsxiv.h" #include "nsxiv.h"
#define _WINDOW_CONFIG #define INCLUDE_WINDOW_CONFIG
#include "config.h" #include "config.h"
#include "icon/data.h" #include "icon/data.h"