Skip to content

Commit

Permalink
updated autotools, fixed some gcc warnings, removed 'git-log' from ve…
Browse files Browse the repository at this point in the history
…rsion
  • Loading branch information
rahra committed Mar 8, 2022
1 parent 468a990 commit aa797f4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
AC_PREREQ(2.67)
define([svnversion], esyscmd([sh -c "echo -n `git log --oneline | wc -l`"]))dnl
AC_INIT([smrender], [[4.2.g]svnversion], [[email protected]])
AC_PREREQ([2.71])
#define([svnversion], esyscmd([sh -c "echo -n `git log --oneline | wc -l`"]))dnl
AC_INIT([smrender],[[4.3.0]],[[email protected]])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AM_PROG_AR
LT_INIT
AC_SUBST([CFLAGS], [["$CFLAGS -Wall -Wextra"]])
#AC_SUBST([CFLAGS], [["-g -Wall"]])
AC_PROG_CC_C99
AC_PROG_CC
AC_PROG_LN_S
AC_PROG_MKDIR_P
AC_CONFIG_HEADERS([config.h])
Expand Down
3 changes: 3 additions & 0 deletions src/libhpxml.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ int cblank(char *c)
{
case '\n':
hpx_lineno_++;
/* fall through */
case '\t':
case '\r':
#ifdef MODMEM
Expand All @@ -328,6 +329,7 @@ int cblank1(const char *c)
{
case '\n':
hpx_lineno_++;
/* fall through */
case '\t':
case '\r':
case ' ':
Expand Down Expand Up @@ -688,6 +690,7 @@ int hpx_fprintf_tag(FILE *f, const hpx_tag_t *p)

case HPX_SINGLE:
s = "/";
/* fall through */
case HPX_OPEN:
n = fprintf(f, "<%.*s", p->tag.len, p->tag.buf);
for (i = 0; i < p->nattr; i++)
Expand Down
9 changes: 5 additions & 4 deletions src/smrender.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2011-2021 Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>
/* Copyright 2011-2022 Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>
*
* This file is part of smrender.
*
Expand All @@ -18,7 +18,8 @@
/*! \file smrender.c
* This file contains the main() function and main initialization functions.
*
* @author Bernhard R. Fischer
* \author Bernhard R. Fischer, <[email protected]>
* \date 2022/03/08
*/

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -463,7 +464,7 @@ char *init_rd_paper(struct rdata *rd, const char *paper)

static void print_version(void)
{
printf("Seamark renderer V" PACKAGE_VERSION ", (c) 2011-2021, Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>.\n"
printf("Seamark renderer V" PACKAGE_VERSION ", (c) 2011-2022, Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>.\n"
"See http://www.abenteuerland.at/smrender/ for more information.\n");
#ifdef HAVE_CAIRO
printf("Using libcairo %s.\n", cairo_version_string());
Expand Down Expand Up @@ -1250,7 +1251,7 @@ int main(int argc, char *argv[])
{
case AUTO_GRID:
auto_grid(rd, &grd);
// intentionally, there's no break
/* fall through */

case USER_GRID:
grid(rd, &grd);
Expand Down

0 comments on commit aa797f4

Please sign in to comment.