aniani/trader
1
0
Fork 0
mirror of https://git.zap.org.au/git/trader.git synced 2025-02-02 15:08:13 -05:00
Code

Merge branch with-autogenerated into with-debian

Browse Source
This commit is contained in:
John Zaitseff 2014-08-13 12:20:26 +10:00
commit a6144e3ef0
42 changed files with 182 additions and 105 deletions

10
INSTALL

@ -45,7 +45,7 @@ and installation:
it), you may pass "--disable-nls" to the configure script. it), you may pass "--disable-nls" to the configure script.
5. Development libraries and header files for all of the above. On many 5. Development libraries and header files for all of the above. On many
systems, these files are part of XXX-dev packages. systems, these files are part of XXX-dev or XXX-devel packages.
6. The GNU Perfect Hash Function Generator, gperf. This utility program 6. The GNU Perfect Hash Function Generator, gperf. This utility program
may be required for parts of the GNU Portability Library. may be required for parts of the GNU Portability Library.
@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This
feature requires GNU Make and allows you to keep the source code tree from feature requires GNU Make and allows you to keep the source code tree from
being modified by the compilation process. To use this option, create a being modified by the compilation process. To use this option, create a
separate build directory, then run configure. For example, if you placed separate build directory, then run configure. For example, if you placed
the Star Traders source code tree in $HOME/src/trader-7.5, you could run the Star Traders source code tree in $HOME/src/trader-7.6, you could run
something like: something like:
mkdir $HOME/build/trader-build-7.5 mkdir $HOME/build/trader-build-7.6
cd $HOME/build/trader-build-7.5 cd $HOME/build/trader-build-7.6
$HOME/src/trader-7.5/configure $HOME/src/trader-7.6/configure
Once again, the Autoconf manual describes these options (and many others): Once again, the Autoconf manual describes these options (and many others):

12
NEWS

@ -15,6 +15,18 @@ consult the Subversion repository for "trader" on The ZAP Group web server
at http://www.zap.org.au/services/svn/. at http://www.zap.org.au/services/svn/.
Version 7.6 (13th August, 2014)
-------------------------------
A minor release to fix compilation bugs under Cygwin: the libiconv library
must be listed AFTER the GNU Portability Library on that platform.
In addition, the minimum and maximum share return values were changed from
-10% to -15% and 20% to 25% respectively. This gives more incentive to
borrow money from the Interstellar Trading Bank, whose interest rate can
reach a maximum of 20%.
Version 7.5 (24th May, 2014) Version 7.5 (24th May, 2014)
---------------------------- ----------------------------

16
build-aux/config.rpath

@ -367,11 +367,7 @@ else
dgux*) dgux*)
hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_flag_spec='-L$libdir'
;; ;;
freebsd2.2*) freebsd2.[01]*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
freebsd2*)
hardcode_direct=yes hardcode_direct=yes
hardcode_minus_L=yes hardcode_minus_L=yes
;; ;;
@ -548,13 +544,11 @@ case "$host_os" in
dgux*) dgux*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
freebsd[23].*)
library_names_spec='$libname$shrext$versuffix'
;;
freebsd* | dragonfly*) freebsd* | dragonfly*)
case "$host_os" in library_names_spec='$libname$shrext'
freebsd[123]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
esac
;; ;;
gnu*) gnu*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'

41
config.h.in

@ -997,13 +997,28 @@
'reference to static identifier "f" in extern inline function'. 'reference to static identifier "f" in extern inline function'.
This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
Suppress the use of extern inline on problematic Apple configurations. Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
OS X 10.8 and earlier mishandle it; see, e.g., on configurations that mistakenly use 'static inline' to implement
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. functions or macros in standard C headers like <ctype.h>. For example,
if isdigit is mistakenly implemented via a static inline function,
a program containing an extern inline function that calls isdigit
may not work since the C standard prohibits extern inline functions
from calling static functions. This bug is known to occur on:
OS X 10.8 and earlier; see:
http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
DragonFly; see
http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
FreeBSD; see:
http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
for clang but remains for g++; see <http://trac.macports.org/ticket/41033>. for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
Perhaps Apple will fix this some day. */ Assume DragonFly and FreeBSD will be similar. */
#if (defined __APPLE__ \ #if (((defined __APPLE__ && defined __MACH__) \
|| defined __DragonFly__ || defined __FreeBSD__) \
&& (defined __header_inline \ && (defined __header_inline \
? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
&& ! defined __clang__) \ && ! defined __clang__) \
@ -1011,19 +1026,19 @@
&& (defined __GNUC__ || defined __cplusplus)) \ && (defined __GNUC__ || defined __cplusplus)) \
|| (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
&& defined __GNUC__ && ! defined __cplusplus)))) && defined __GNUC__ && ! defined __cplusplus))))
# define _GL_EXTERN_INLINE_APPLE_BUG # define _GL_EXTERN_INLINE_STDHEADER_BUG
#endif #endif
#if ((__GNUC__ \ #if ((__GNUC__ \
? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
: (199901L <= __STDC_VERSION__ \ : (199901L <= __STDC_VERSION__ \
&& !defined __HP_cc \ && !defined __HP_cc \
&& !(defined __SUNPRO_C && __STDC__))) \ && !(defined __SUNPRO_C && __STDC__))) \
&& !defined _GL_EXTERN_INLINE_APPLE_BUG) && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# define _GL_INLINE inline # define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE extern inline
# define _GL_EXTERN_INLINE_IN_USE # define _GL_EXTERN_INLINE_IN_USE
#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
&& !defined _GL_EXTERN_INLINE_APPLE_BUG) && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
@ -1120,6 +1135,16 @@
is a misnomer outside of parameter lists. */ is a misnomer outside of parameter lists. */
#define _UNUSED_PARAMETER_ _GL_UNUSED #define _UNUSED_PARAMETER_ _GL_UNUSED
/* gcc supports the "unused" attribute on possibly unused labels, and
g++ has since version 4.5. Note to support C++ as well as C,
_GL_UNUSED_LABEL should be used with a trailing ; */
#if !defined __cplusplus || __GNUC__ > 4 \
|| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
# define _GL_UNUSED_LABEL _GL_UNUSED
#else
# define _GL_UNUSED_LABEL
#endif
/* The __pure__ attribute was added in gcc 2.96. */ /* The __pure__ attribute was added in gcc 2.96. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))

20
configure vendored

@ -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 Star Traders 7.5. # Generated by GNU Autoconf 2.69 for Star Traders 7.6.
# #
# Report bugs to <J.Zaitseff@zap.org.au>. # Report bugs to <J.Zaitseff@zap.org.au>.
# #
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='Star Traders' PACKAGE_NAME='Star Traders'
PACKAGE_TARNAME='trader' PACKAGE_TARNAME='trader'
PACKAGE_VERSION='7.5' PACKAGE_VERSION='7.6'
PACKAGE_STRING='Star Traders 7.5' PACKAGE_STRING='Star Traders 7.6'
PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au'
PACKAGE_URL='http://www.zap.org.au/software/trader/' PACKAGE_URL='http://www.zap.org.au/software/trader/'
@ -1961,7 +1961,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 Star Traders 7.5 to adapt to many kinds of systems. \`configure' configures Star Traders 7.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -2031,7 +2031,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 Star Traders 7.5:";; short | recursive ) echo "Configuration of Star Traders 7.6:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -2138,7 +2138,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
Star Traders configure 7.5 Star Traders configure 7.6
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.
@ -2790,7 +2790,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 Star Traders $as_me 7.5, which was It was created by Star Traders $as_me 7.6, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3686,7 +3686,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='trader' PACKAGE='trader'
VERSION='7.5' VERSION='7.6'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -18945,7 +18945,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 Star Traders $as_me 7.5, which was This file was extended by Star Traders $as_me 7.6, 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
@ -19012,7 +19012,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="\\
Star Traders config.status 7.5 Star Traders config.status 7.6
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\\"

4
configure.ac

@ -6,7 +6,7 @@ dnl * *
dnl ********************************************************************* dnl *********************************************************************
dnl dnl
dnl Author: John Zaitseff <J.Zaitseff@zap.org.au> dnl Author: John Zaitseff <J.Zaitseff@zap.org.au>
dnl $Id: configure.ac 514 2014-05-22 01:05:51Z john $ dnl $Id: configure.ac 545 2014-06-18 10:55:15Z john $
dnl dnl
dnl This file, configure.ac, contains information required by autoconf to dnl This file, configure.ac, contains information required by autoconf to
dnl generate the corresponding configure script. dnl generate the corresponding configure script.
@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see http://www.gnu.org/licenses/. dnl along with this program. If not, see http://www.gnu.org/licenses/.
AC_INIT([Star Traders], [7.5], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_INIT([Star Traders], [7.6], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/])
AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
AC_PREREQ([2.67]) AC_PREREQ([2.67])

4
doc/trader.6

@ -6,7 +6,7 @@
.\" ********************************************************************* .\" *********************************************************************
.\" .\"
.\" Author: John Zaitseff <J.Zaitseff@zap.org.au> .\" Author: John Zaitseff <J.Zaitseff@zap.org.au>
.\" $Id: trader.6 523 2014-05-23 21:28:25Z john $ .\" $Id: trader.6 554 2014-08-13 01:55:30Z john $
.\" .\"
.\" This program is free software: you can redistribute it and/or modify .\" This program is free software: you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by .\" it under the terms of the GNU General Public License as published by
@ -41,7 +41,7 @@
.if \n[.g] .mso www.tmac .if \n[.g] .mso www.tmac
.\" .\"
.\" ********************************************************************* .\" *********************************************************************
.TH TRADER 6 "24th May, 2014" "Unix-like systems" .TH TRADER 6 "13th August, 2014" "Unix-like systems"
.SH NAME .SH NAME
trader \- a game of interstellar trading trader \- a game of interstellar trading
.\" ********************************************************************* .\" *********************************************************************

37
lib/localcharset.c

@ -34,6 +34,7 @@
#if defined _WIN32 || defined __WIN32__ #if defined _WIN32 || defined __WIN32__
# define WINDOWS_NATIVE # define WINDOWS_NATIVE
# include <locale.h>
#endif #endif
#if defined __EMX__ #if defined __EMX__
@ -461,14 +462,34 @@ locale_charset (void)
static char buf[2 + 10 + 1]; static char buf[2 + 10 + 1];
/* The Windows API has a function returning the locale's codepage as a /* The Windows API has a function returning the locale's codepage as
number: GetACP(). a number, but the value doesn't change according to what the
When the output goes to a console window, it needs to be provided in 'setlocale' call specified. So we use it as a last resort, in
GetOEMCP() encoding if the console is using a raster font, or in case the string returned by 'setlocale' doesn't specify the
GetConsoleOutputCP() encoding if it is using a TrueType font. codepage. */
But in GUI programs and for output sent to files and pipes, GetACP() char *current_locale = setlocale (LC_ALL, NULL);
encoding is the best bet. */ char *pdot;
sprintf (buf, "CP%u", GetACP ());
/* If they set different locales for different categories,
'setlocale' will return a semi-colon separated list of locale
values. To make sure we use the correct one, we choose LC_CTYPE. */
if (strchr (current_locale, ';'))
current_locale = setlocale (LC_CTYPE, NULL);
pdot = strrchr (current_locale, '.');
if (pdot)
sprintf (buf, "CP%s", pdot + 1);
else
{
/* The Windows API has a function returning the locale's codepage as a
number: GetACP().
When the output goes to a console window, it needs to be provided in
GetOEMCP() encoding if the console is using a raster font, or in
GetConsoleOutputCP() encoding if it is using a TrueType font.
But in GUI programs and for output sent to files and pipes, GetACP()
encoding is the best bet. */
sprintf (buf, "CP%u", GetACP ());
}
codeset = buf; codeset = buf;
#elif defined OS2 #elif defined OS2

31
m4/extern-inline.m4

@ -19,13 +19,28 @@ AC_DEFUN([gl_EXTERN_INLINE],
'reference to static identifier "f" in extern inline function'. 'reference to static identifier "f" in extern inline function'.
This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
Suppress the use of extern inline on problematic Apple configurations. Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
OS X 10.8 and earlier mishandle it; see, e.g., on configurations that mistakenly use 'static inline' to implement
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. functions or macros in standard C headers like <ctype.h>. For example,
if isdigit is mistakenly implemented via a static inline function,
a program containing an extern inline function that calls isdigit
may not work since the C standard prohibits extern inline functions
from calling static functions. This bug is known to occur on:
OS X 10.8 and earlier; see:
http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
DragonFly; see
http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
FreeBSD; see:
http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
for clang but remains for g++; see <http://trac.macports.org/ticket/41033>. for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
Perhaps Apple will fix this some day. */ Assume DragonFly and FreeBSD will be similar. */
#if (defined __APPLE__ \ #if (((defined __APPLE__ && defined __MACH__) \
|| defined __DragonFly__ || defined __FreeBSD__) \
&& (defined __header_inline \ && (defined __header_inline \
? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
&& ! defined __clang__) \ && ! defined __clang__) \
@ -33,19 +48,19 @@ AC_DEFUN([gl_EXTERN_INLINE],
&& (defined __GNUC__ || defined __cplusplus)) \ && (defined __GNUC__ || defined __cplusplus)) \
|| (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
&& defined __GNUC__ && ! defined __cplusplus)))) && defined __GNUC__ && ! defined __cplusplus))))
# define _GL_EXTERN_INLINE_APPLE_BUG # define _GL_EXTERN_INLINE_STDHEADER_BUG
#endif #endif
#if ((__GNUC__ \ #if ((__GNUC__ \
? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
: (199901L <= __STDC_VERSION__ \ : (199901L <= __STDC_VERSION__ \
&& !defined __HP_cc \ && !defined __HP_cc \
&& !(defined __SUNPRO_C && __STDC__))) \ && !(defined __SUNPRO_C && __STDC__))) \
&& !defined _GL_EXTERN_INLINE_APPLE_BUG) && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# define _GL_INLINE inline # define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE extern inline
# define _GL_EXTERN_INLINE_IN_USE # define _GL_EXTERN_INLINE_IN_USE
#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
&& !defined _GL_EXTERN_INLINE_APPLE_BUG) && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))

12
m4/gnulib-common.m4

@ -1,4 +1,4 @@
# gnulib-common.m4 serial 34 # gnulib-common.m4 serial 35
dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -49,6 +49,16 @@ AC_DEFUN([gl_COMMON_BODY], [
is a misnomer outside of parameter lists. */ is a misnomer outside of parameter lists. */
#define _UNUSED_PARAMETER_ _GL_UNUSED #define _UNUSED_PARAMETER_ _GL_UNUSED
/* gcc supports the "unused" attribute on possibly unused labels, and
g++ has since version 4.5. Note to support C++ as well as C,
_GL_UNUSED_LABEL should be used with a trailing ; */
#if !defined __cplusplus || __GNUC__ > 4 \
|| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
# define _GL_UNUSED_LABEL _GL_UNUSED
#else
# define _GL_UNUSED_LABEL
#endif
/* The __pure__ attribute was added in gcc 2.96. */ /* The __pure__ attribute was added in gcc 2.96. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))

2
m4/intl.m4

@ -1,4 +1,4 @@
# intl.m4 serial 24 (gettext-0.18.3) # intl.m4 serial 27 (gettext-0.18.3)
dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,

2
m4/po.m4

@ -1,4 +1,4 @@
# po.m4 serial 21 (gettext-0.18.3) # po.m4 serial 23 (gettext-0.18.3)
dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,

BIN
po/da.gmo

Binary file not shown.

6
po/da.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:57+1000\n" "PO-Revision-Date: 2014-08-13 11:50+1000\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n" "Language: da\n"

BIN
po/de.gmo

Binary file not shown.

6
po/de.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:57+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n"
"Last-Translator: Philipp Thomas <pth@suse.de>\n" "Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n" "Language: de\n"

BIN
po/en@quot.gmo

Binary file not shown.

6
po/en@quot.po

@ -27,10 +27,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-08-13 12:13+1000\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
"Language: en@quot\n" "Language: en@quot\n"

BIN
po/en_AU.gmo

Binary file not shown.

6
po/en_AU.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:57+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (Australian)\n" "Language-Team: English (Australian)\n"
"Language: en_AU\n" "Language: en_AU\n"

BIN
po/en_CA.gmo

Binary file not shown.

6
po/en_CA.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:58+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (Canadian)\n" "Language-Team: English (Canadian)\n"
"Language: en_CA\n" "Language: en_CA\n"

BIN
po/en_GB.gmo

Binary file not shown.

6
po/en_GB.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:58+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (British)\n" "Language-Team: English (British)\n"
"Language: en_GB\n" "Language: en_GB\n"

BIN
po/en_US.gmo

Binary file not shown.

6
po/en_US.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:58+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English\n" "Language-Team: English\n"
"Language: en_US\n" "Language: en_US\n"

BIN
po/eo.gmo

Binary file not shown.

6
po/eo.po

@ -13,10 +13,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:59+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n" "Language: eo\n"

BIN
po/fi.gmo

Binary file not shown.

6
po/fi.po

@ -13,10 +13,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 10:59+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n" "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"Language: fi\n" "Language: fi\n"

BIN
po/fr.gmo

Binary file not shown.

6
po/fr.po

@ -12,10 +12,10 @@
# Frédéric Marchal <fmarchal@perso.be>, 2012. # Frédéric Marchal <fmarchal@perso.be>, 2012.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 11:00+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n" "Language: fr\n"

BIN
po/hr.gmo

Binary file not shown.

6
po/hr.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 11:00+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n" "Language: hr\n"

BIN
po/nb.gmo

Binary file not shown.

6
po/nb.po

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 11:00+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n" "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n" "Language: nb\n"

BIN
po/ru.gmo

Binary file not shown.

6
po/ru.po

@ -15,10 +15,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: 2014-05-22 11:01+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n"
"Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n" "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
"Language-Team: Russian <gnu@mx.ru>\n" "Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n" "Language: ru\n"

4
po/trader.pot

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.5\n" "Project-Id-Version: trader 7.6\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2014-05-24 08:24+1000\n" "POT-Creation-Date: 2014-08-13 12:13+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

4
src/Makefile.am

@ -6,7 +6,7 @@
######################################################################### #########################################################################
# Author: John Zaitseff <J.Zaitseff@zap.org.au> # Author: John Zaitseff <J.Zaitseff@zap.org.au>
# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # $Id: Makefile.am 546 2014-06-18 10:56:09Z john $
# #
# This file, src/Makefile.am, contains the source-code Makefile for Star # This file, src/Makefile.am, contains the source-code Makefile for Star
# Traders. It needs to be processed by automake to produce the # Traders. It needs to be processed by automake to produce the
@ -43,6 +43,6 @@ trader_SOURCES = \
trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-DLOCALEDIR=\"$(localedir)\" -DLOCALEDIR=\"$(localedir)\"
trader_LDADD = @CURSES_LIB@ @LIBICONV@ $(top_builddir)/lib/libgnu.a @LIBINTL@ trader_LDADD = @CURSES_LIB@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@
EXTRA_DIST = README EXTRA_DIST = README

4
src/Makefile.in

@ -22,7 +22,7 @@
######################################################################### #########################################################################
# Author: John Zaitseff <J.Zaitseff@zap.org.au> # Author: John Zaitseff <J.Zaitseff@zap.org.au>
# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # $Id: Makefile.am 546 2014-06-18 10:56:09Z john $
# #
# This file, src/Makefile.am, contains the source-code Makefile for Star # This file, src/Makefile.am, contains the source-code Makefile for Star
# Traders. It needs to be processed by automake to produce the # Traders. It needs to be processed by automake to produce the
@ -993,7 +993,7 @@ trader_SOURCES = \
trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-DLOCALEDIR=\"$(localedir)\" -DLOCALEDIR=\"$(localedir)\"
trader_LDADD = @CURSES_LIB@ @LIBICONV@ $(top_builddir)/lib/libgnu.a @LIBINTL@ trader_LDADD = @CURSES_LIB@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@
EXTRA_DIST = README EXTRA_DIST = README
all: all-am all: all-am

6
src/globals.h

@ -7,7 +7,7 @@
/* /*
Author: John Zaitseff <J.Zaitseff@zap.org.au> Author: John Zaitseff <J.Zaitseff@zap.org.au>
$Id: globals.h 514 2014-05-22 01:05:51Z john $ $Id: globals.h 551 2014-08-13 01:32:27Z john $
This file, globals.h, contains declarations for global variables and This file, globals.h, contains declarations for global variables and
structures used in Star Traders. structures used in Star Traders.
@ -74,8 +74,8 @@
#define DEC_SHARE_PRICE 0.65 // 65% x 35% chance of decrementing same #define DEC_SHARE_PRICE 0.65 // 65% x 35% chance of decrementing same
#define PRICE_CHANGE_RATE 0.25 // Up to 25% of share price is used to incr./decr. #define PRICE_CHANGE_RATE 0.25 // Up to 25% of share price is used to incr./decr.
#define INITIAL_RETURN 0.05 // Initial return per share: 5% #define INITIAL_RETURN 0.05 // Initial return per share: 5%
#define MIN_COMPANY_RETURN -0.10 // Minimum return per share (yes, negative!) #define MIN_COMPANY_RETURN -0.15 // Minimum return per share (yes, negative!)
#define MAX_COMPANY_RETURN 0.20 // Maximum return per share #define MAX_COMPANY_RETURN 0.25 // Maximum return per share
#define CHANGE_COMPANY_RETURN 0.50 // Chance of randomly changing return #define CHANGE_COMPANY_RETURN 0.50 // Chance of randomly changing return
#define DEC_COMPANY_RETURN 0.50 // Chance such change will decrease return #define DEC_COMPANY_RETURN 0.50 // Chance such change will decrease return
#define RETURN_MAX_CHANGE 0.03 // Maximum that company return will change #define RETURN_MAX_CHANGE 0.03 // Maximum that company return will change