summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
authorMichael Jennings <mej@lanl.gov>2020-02-28 17:06:54 -0700
committerMichael Jennings <mej@lanl.gov>2020-02-28 17:06:54 -0700
commit5d475d010500ffaf1801266e7d1d99f7494b114e (patch)
tree0c38ac261f813ade37e69fc644bfaadaee6b5463 /src/options.c
parent37d7e09045f5c4035f749cad4ffa7f5808f3f230 (diff)
downloadeterm-5d475d010500ffaf1801266e7d1d99f7494b114e.tar.gz
src/*.c, Eterm.spec: Various build fixes
Several changes here to make it build on RHEL/CentOS 8: - Replace outdated MEMSET() macro with (g)libc memset() - Update Release field to use `git describe` just like LibAST - Fix `make distcheck` by adding an uninstall-hook for src/gdb.scr - At long last, remove the ancient RPM %changelog content - Fix incompatibility with my traditional choices for CFLAGS (-O0 -g3) and modern RHEL security/hardening goop which, due to being implemented in the GCC optimizer, is rendered non-functional by building with -O0! - Rename backgrounds tarball so that it doesn't have the Eterm version in its name since, shockingly, it never changes based on the version of Eterm!
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/options.c b/src/options.c
index aa19b9a..7531aa6 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1731,11 +1731,11 @@ parse_image(char *buff, void *state)
return NULL;
}
if (new) {
- MEMSET(images[idx].current, 0, sizeof(simage_t));
+ memset(images[idx].current, 0, sizeof(simage_t));
images[idx].current->pmap = (pixmap_t *) MALLOC(sizeof(pixmap_t));
images[idx].current->iml = (imlib_t *) MALLOC(sizeof(imlib_t));
- MEMSET(images[idx].current->pmap, 0, sizeof(pixmap_t));
- MEMSET(images[idx].current->iml, 0, sizeof(imlib_t));
+ memset(images[idx].current->pmap, 0, sizeof(pixmap_t));
+ memset(images[idx].current->iml, 0, sizeof(imlib_t));
}
} else if (!BEG_STRCASECMP(buff, "color ")) {
char *fg = spiftool_get_word(2, buff), *bg = spiftool_get_word(3, buff);
@@ -2546,10 +2546,10 @@ init_defaults(void)
rs_path = NULL;
#endif
colorfgbg = DEFAULT_RSTYLE;
- MEMSET(PixColors, 0, sizeof(PixColors));
+ memset(PixColors, 0, sizeof(PixColors));
/* Font stuff. */
- MEMSET(rs_font, 0, sizeof(char *) * NFONTS);
+ memset(rs_font, 0, sizeof(char *) * NFONTS);
#if AUTO_ENCODING
/* Auto-encoding means the default fonts are chosen by locale. */
# ifdef MULTI_CHARSET
@@ -2756,8 +2756,8 @@ post_parse(void)
simg->iml = (imlib_t *) MALLOC(sizeof(imlib_t));
simg->fg = WhitePixel(Xdisplay, Xscreen);
simg->bg = BlackPixel(Xdisplay, Xscreen);
- MEMSET(simg->pmap, 0, sizeof(pixmap_t));
- MEMSET(simg->iml, 0, sizeof(imlib_t));
+ memset(simg->pmap, 0, sizeof(pixmap_t));
+ memset(simg->iml, 0, sizeof(imlib_t));
images[i].mode = MODE_IMAGE & ALLOW_IMAGE;
}
images[i].current = simg;