glenn/tts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

T.83.1: Fix non-Darwin build; fix WIDE build.

Browse source
This commit is contained in:
Felicity Tarnell 2014-03-05 16:04:57 +00:00
parent 3560996263
commit 197adb654a
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for RT/TTS T.83.0. # Generated by GNU Autoconf 2.69 for RT/TTS T.83.1.
# #
# Report bugs to <felicity@loreley.flyingparchment.org.uk>. # Report bugs to <felicity@loreley.flyingparchment.org.uk>.
# #
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='RT/TTS' PACKAGE_NAME='RT/TTS'
PACKAGE_TARNAME='rt-tts' PACKAGE_TARNAME='rt-tts'
PACKAGE_VERSION='T.83.0' PACKAGE_VERSION='T.83.1'
PACKAGE_STRING='RT/TTS T.83.0' PACKAGE_STRING='RT/TTS T.83.1'
PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk' PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk'
PACKAGE_URL='' PACKAGE_URL=''
@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures RT/TTS T.83.0 to adapt to many kinds of systems. \`configure' configures RT/TTS T.83.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1293,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of RT/TTS T.83.0:";; short | recursive ) echo "Configuration of RT/TTS T.83.1:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1380,7 +1380,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
RT/TTS configure T.83.0 RT/TTS configure T.83.1
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -1749,7 +1749,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by RT/TTS $as_me T.83.0, which was It was created by RT/TTS $as_me T.83.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -4720,7 +4720,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by RT/TTS $as_me T.83.0, which was This file was extended by RT/TTS $as_me T.83.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -4782,7 +4782,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
RT/TTS config.status T.83.0 RT/TTS config.status T.83.1
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View file

@ -1,5 +1,5 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([RT/TTS], [T.83.0], [felicity@loreley.flyingparchment.org.uk]) AC_INIT([RT/TTS], [T.83.1], [felicity@loreley.flyingparchment.org.uk])
AC_CONFIG_SRCDIR([tts.c]) AC_CONFIG_SRCDIR([tts.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

17
tts.c
View file

@ -126,12 +126,13 @@ int c;
#define STRLEN WPFX(len) #define STRLEN WPFX(len)
#define STRCMP WPFX(cmp) #define STRCMP WPFX(cmp)
#define STRNCMP WPFX(cmp) #define STRNCMP WPFX(ncmp)
#define STRCPY WPFX(cpy) #define STRCPY WPFX(cpy)
#define STRNCPY WPFX(ncpy) #define STRNCPY WPFX(ncpy)
#define STRSTR WPFX(str) #define STRSTR WPFX(str)
#define STRFTIME WPFX(ftime) #define STRFTIME WPFX(ftime)
#define STRDUP WPFX(dup) #define STRDUP WPFX(dup)
#define STRTOL WPFX(tol)
#define ISSPACE ISX(space) #define ISSPACE ISX(space)
@ -462,7 +463,7 @@ static int delete_advance = 1;
static int mark_advance = 1; static int mark_advance = 1;
static int bill_advance = 0; static int bill_advance = 0;
static int bill_increment = 0; static int bill_increment = 0;
static char *auto_nonbillable; static WCHAR *auto_nonbillable;
#define VTYPE_INT 1 #define VTYPE_INT 1
#define VTYPE_BOOL 2 #define VTYPE_BOOL 2
@ -704,8 +705,10 @@ char rcfile[PATH_MAX + 1];
if (doexit) if (doexit)
break; break;
#ifdef USE_DARWIN_POWER
if (donesleep) if (donesleep)
prompt_sleep(); prompt_sleep();
#endif
drawheader(); drawheader();
drawentries(); drawentries();
@ -714,8 +717,10 @@ char rcfile[PATH_MAX + 1];
if (GETCH(&c) == ERR) { if (GETCH(&c) == ERR) {
if (doexit) if (doexit)
break; break;
#ifdef USE_DARWIN_POWER
if (donesleep) if (donesleep)
prompt_sleep(); prompt_sleep();
#endif
if (time(NULL) - laststatus >= 2) if (time(NULL) - laststatus >= 2)
drawstatus(WIDE("")); drawstatus(WIDE(""));
if (time(NULL) - lastsave > 60) if (time(NULL) - lastsave > 60)
@ -1556,10 +1561,10 @@ drawheader()
{ {
WCHAR title[64]; WCHAR title[64];
SNPRINTF(title, WSIZEOF(title), "TTS %s - Type '?' for help", SNPRINTF(title, WSIZEOF(title), WIDE("TTS %s - Type '?' for help"),
tts_version); tts_version);
wmove(titwin, 0, 0); wmove(titwin, 0, 0);
waddstr(titwin, title); WADDSTR(titwin, title);
if (itime > 0) { if (itime > 0) {
WCHAR str[128]; WCHAR str[128];
@ -2630,11 +2635,11 @@ int val;
break; break;
case VTYPE_STRING: case VTYPE_STRING:
*(char **)var->va_addr = STRDUP(argv[2]); *(WCHAR **)var->va_addr = STRDUP(argv[2]);
break; break;
case VTYPE_INT: case VTYPE_INT:
*(int *)var->va_addr = atoi(argv[2]); *(int *)var->va_addr = STRTOL(argv[2], NULL, 0);
break; break;
} }
} }