From 197adb654a784b7b81c86d30e47c7ff917ef5757 Mon Sep 17 00:00:00 2001 From: Felicity Tarnell Date: Wed, 5 Mar 2014 16:04:57 +0000 Subject: [PATCH] T.83.1: Fix non-Darwin build; fix WIDE build. --- configure | 18 +++++++++--------- configure.ac | 2 +- tts.c | 17 +++++++++++------ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 9d4056a..0edce83 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # 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 . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RT/TTS' PACKAGE_TARNAME='rt-tts' -PACKAGE_VERSION='T.83.0' -PACKAGE_STRING='RT/TTS T.83.0' +PACKAGE_VERSION='T.83.1' +PACKAGE_STRING='RT/TTS T.83.1' PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk' 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. # This message is too long to be a string in the A/UX 3.1 sh. 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]... @@ -1293,7 +1293,7 @@ fi if test -n "$ac_init_help"; then 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 cat <<\_ACEOF @@ -1380,7 +1380,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RT/TTS configure T.83.0 +RT/TTS configure T.83.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1749,7 +1749,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while 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 $ $0 $@ @@ -4720,7 +4720,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. 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 CONFIG_FILES = $CONFIG_FILES @@ -4782,7 +4782,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 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, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index bbbc92f..4d981b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ 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_HEADERS([config.h]) diff --git a/tts.c b/tts.c index 6838d11..f5e9845 100644 --- a/tts.c +++ b/tts.c @@ -126,12 +126,13 @@ int c; #define STRLEN WPFX(len) #define STRCMP WPFX(cmp) -#define STRNCMP WPFX(cmp) +#define STRNCMP WPFX(ncmp) #define STRCPY WPFX(cpy) #define STRNCPY WPFX(ncpy) #define STRSTR WPFX(str) #define STRFTIME WPFX(ftime) #define STRDUP WPFX(dup) +#define STRTOL WPFX(tol) #define ISSPACE ISX(space) @@ -462,7 +463,7 @@ static int delete_advance = 1; static int mark_advance = 1; static int bill_advance = 0; static int bill_increment = 0; -static char *auto_nonbillable; +static WCHAR *auto_nonbillable; #define VTYPE_INT 1 #define VTYPE_BOOL 2 @@ -704,8 +705,10 @@ char rcfile[PATH_MAX + 1]; if (doexit) break; +#ifdef USE_DARWIN_POWER if (donesleep) prompt_sleep(); +#endif drawheader(); drawentries(); @@ -714,8 +717,10 @@ char rcfile[PATH_MAX + 1]; if (GETCH(&c) == ERR) { if (doexit) break; +#ifdef USE_DARWIN_POWER if (donesleep) prompt_sleep(); +#endif if (time(NULL) - laststatus >= 2) drawstatus(WIDE("")); if (time(NULL) - lastsave > 60) @@ -1556,10 +1561,10 @@ drawheader() { WCHAR title[64]; - SNPRINTF(title, WSIZEOF(title), "TTS %s - Type '?' for help", + SNPRINTF(title, WSIZEOF(title), WIDE("TTS %s - Type '?' for help"), tts_version); wmove(titwin, 0, 0); - waddstr(titwin, title); + WADDSTR(titwin, title); if (itime > 0) { WCHAR str[128]; @@ -2630,11 +2635,11 @@ int val; break; case VTYPE_STRING: - *(char **)var->va_addr = STRDUP(argv[2]); + *(WCHAR **)var->va_addr = STRDUP(argv[2]); break; case VTYPE_INT: - *(int *)var->va_addr = atoi(argv[2]); + *(int *)var->va_addr = STRTOL(argv[2], NULL, 0); break; } }