--- gambit-0.2006.01.20.orig/debian/menu +++ gambit-0.2006.01.20/debian/menu @@ -0,0 +1,5 @@ +?package(gambit):needs="X11" \ + section="Applications/Science/Mathematics" \ + icon="/usr/share/pixmaps/gambit.xpm" \ + title="gambit" \ + command="/usr/bin/gambit" --- gambit-0.2006.01.20.orig/debian/control +++ gambit-0.2006.01.20/debian/control @@ -0,0 +1,15 @@ +Source: gambit +Section: math +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 5), autotools-dev, libwxgtk2.6-dev +Standards-Version: 3.7.2 + +Package: gambit +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Game theory analysis software and tools + Gambit is a collection of game theory software for the construction + and analysis of finite extensive and normal form games. It has a + graphical user interface and includes a scripting language with + built-in primitives for constructing and analyzing games. --- gambit-0.2006.01.20.orig/debian/compat +++ gambit-0.2006.01.20/debian/compat @@ -0,0 +1 @@ +5 --- gambit-0.2006.01.20.orig/debian/gambit.desktop +++ gambit-0.2006.01.20/debian/gambit.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Name=Gambit Game Analysis +Comment=Construction and analysis of finite extensive and normal form games +Exec=gambit +Icon=gambit +Type=Application +Categories=Education;Math;Science; --- gambit-0.2006.01.20.orig/debian/gambit.xpm +++ gambit-0.2006.01.20/debian/gambit.xpm @@ -0,0 +1,45 @@ +/* XPM */ +static char *gambit32x32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 7 1", +" c #007F00", +". c green", +"X c #7F0000", +"o c red", +"O c #7F7F7F", +"+ c #CCCCCC", +"@ c gray100", +/* pixels */ +"XXXXX@@XXX@@X@@@X@XXXX@@@X@XXXXX", +"XOOOXOX@OOX@XX@XXOXOOOX@@XO@OXOO", +"XO@@@OXO@@XOXOX@XOXO@@XO@XO@@XO@", +"XO@XX@XXXXXOXO@OXOXXXX@O@XO@@XO@", +"XO@@XOXOOOXOXO@@XOXOOOX@@XO@@XO@", +"XO@@XOXO@@XOXO@@XOXO@@XO@XO@@XO@", +"XXXXXOXO@@XOXO@@XOXXXX@O@Xooooo@", +"@OOOOO@O@@@O@O@@@O@OOOO@@ooooooO", +"@@@@@@@@@@@@@@@@@@@@@@@@ooOOOOOO", +"@@@@@@@@@@@@@@@@@....XXooOO@@@@@", +"@@@@@@@@@@@@@@@@.....XXooO@@@@@@", +"@@@@@@@@@@@@@@@..OOOOXX+oo@@@@@@", +"@@@@@@@@@@@@@@..OO@@@@++@oooooo@", +"@@@@@@@@@@@@@..OO@@@@XX@@@oooooO", +"@@@@@@@ooo ..OO@@@@@XX+@@@OOOOO", +"@@@@@@oooo ..O@@@@@@XX+@@@@@@@@", +"@@@@@ooOOO +..@@@@@@XX+@@ooooo@", +"@@@@ooOO@@ +@..@@@@@@++@ooooooO", +"@@@ooOO@@@@++@@..@@@@XX@ooOOOOOO", +"@@ooOO@@@@ @@@@.....XXooOO@@@@@", +"oooOO@@@@@ +@@@@....XXooO@@@@@@", +"oooO@@@@@@ +@@@@@OOOOOOoo@@@@@@", +"OOoo@@@@@@ +@@@@@@@@@@@@oooooo@", +"@@@oo@@@@@@++@@@......@@@@oooooO", +"@@@@oo@@@@ @@@.......O@@@@OOOOO", +"@@@@@oo@@@ +@..OOOOOOO@@@@@@@@@", +"@@@@@@oooo ...OO@@@@@@@@@@@@@@@", +"@@@@@@@ooo ...O@@@@@@@@@@@@@@@@", +"@@@@@@@@OOOOOO..@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@.......@@@@@@@@@@", +"@@@@@@@@@@@@@@@@......O@@@@@@@@@", +"@@@@@@@@@@@@@@@@@OOOOOO@@@@@@@@@" +}; --- gambit-0.2006.01.20.orig/debian/changelog +++ gambit-0.2006.01.20/debian/changelog @@ -0,0 +1,87 @@ +gambit (0.2006.01.20-3) unstable; urgency=low + + * QA upload. + * Set Maintainer to QA Group (see #561254) + * Import patch from Martin Michlmayr to build with gcc4.4 (Closes: #505074) + * Kick dh_desktop (no longer needed) + * Move config.* renewal from clean to configure + * Move dh_installdeb to proper location + * Fix Section in Menu and Desktop file + + -- Christoph Egger Mon, 21 Dec 2009 16:35:22 +0100 + +gambit (0.2006.01.20-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with new GCC 4.3 (Closes: #417201). + + -- Luk Claes Tue, 25 Mar 2008 23:07:32 +0000 + +gambit (0.2006.01.20-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 4.3 (Closes: #417201). + + -- Luk Claes Sun, 09 Mar 2008 13:39:52 +0000 + +gambit (0.2006.01.20-2) unstable; urgency=low + + * Acknowledge fixes in NMU: (Closes: #361389 on missing include, + Closes: #315214 on stupid pointer casts, Closes: #369708 on + NULL assignment to iterator, Closes: #370743 on removal of extra + qualifications). + * Include .desktop file (Closes: #375766). + * Updated standards version. + + -- Peter van Rossum Sun, 10 Sep 2006 20:36:37 +0200 + + + +gambit (0.2006.01.20-1.2) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * Remove extra qualifications from C++ file (Closes: #370743). + * Don't assign NULL to an iterator (Closes: #369708). + + -- Martin Michlmayr Thu, 08 Jun 2006 21:55:07 +0200 + + + + +gambit (0.2006.01.20-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix build for 64 bits arch due to stupid pointer casts into int. rather + uses the dedicated %p format. (Closes: #315214). + * Add missing #include . (Closes: #361389). + + -- Pierre Habouzit Mon, 10 Apr 2006 21:49:26 +0200 + + +gambit (0.2006.01.20-1) unstable; urgency=low + + * New upstream release, released 20 Jan 2006. (Closes: #323525 on + FTBFS because of missing forward class declarations). + + -- Peter van Rossum Thu, 6 Apr 2006 07:36:28 +0200 + +gambit (0.97.0.7-1) unstable; urgency=low + + * New upstream release, released 15 Oct 2004. (Closes: #227262 on + edit game segfault; closes #268445 on FTBFS with gcc 3.4) + + -- Peter van Rossum Wed, 4 May 2005 18:28:16 +0200 + +gambit (0.97.0.4-1) unstable; urgency=low + + * New upstream version; includes backported code from development version + to export extensive form games to graphical files. + + -- Peter van Rossum Wed, 24 Sep 2003 18:30:25 -0700 + +gambit (0.97.0.3-1) unstable; urgency=low + + * Initial Release. (Closes: #186539) + + -- Peter van Rossum Wed, 26 Mar 2003 13:09:11 -0700 + --- gambit-0.2006.01.20.orig/debian/gambit.man +++ gambit-0.2006.01.20/debian/gambit.man @@ -0,0 +1,25 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH GAMBIT 1 "March 26, 2003" +.SH NAME +gambit - game theory analysis software +.SH SYNOPSIS +.B gambit +.SH DESCRIPTION +This manual page documents briefly the +.B gambit +command. Gambit is a tool for analysing games presented in +extensive or normal form. The command +.B gambit +starts the graphical user interface. +.PP +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.SH AUTHOR +The principal developers of Gambit are Richard D. McKelvey (California +Institute of Technology), Andrew McLennan (University of Minesota), and +Theodore Turocy (Texas A&M University). The Gambit Project can be reached at +. This manual page was written by Peter van Rossum + for the Debian project. --- gambit-0.2006.01.20.orig/debian/dirs +++ gambit-0.2006.01.20/debian/dirs @@ -0,0 +1 @@ +usr/bin --- gambit-0.2006.01.20.orig/debian/watch +++ gambit-0.2006.01.20/debian/watch @@ -0,0 +1,11 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# +http://econweb.tamu.edu/gambit gambit[-_](\d.*\d)\.tar\.gz + --- gambit-0.2006.01.20.orig/debian/README.Debian +++ gambit-0.2006.01.20/debian/README.Debian @@ -0,0 +1,15 @@ +gambit for Debian +----------------- + + * Executable names changed + + The name of the executable gcl (gambit command language) has been + changed to gambitcl to avoid a conflict with gcl (GNU common lisp). + For consistency's sake, the name of wxgcl has been changed to wxgambitcl. + + * Manual distributed separately + + Because of its size and infrequent updates, the manual is distributed + separately in the gambit-doc package. + + -- Peter van Rossum Wed, 26 Mar 2003 15:19:40 -0700 --- gambit-0.2006.01.20.orig/debian/rules +++ gambit-0.2006.01.20/debian/rules @@ -0,0 +1,93 @@ +#!/usr/bin/make -f +# debian/rules based on sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + # Configure the package + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --disable-shared \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + +build: build-stamp + +build-stamp: config.status + # Compile the package + dh_testdir + $(MAKE) + touch build-stamp + +clean: + # Clean up after the build process. + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean config.sub config.guess + +install: build + # Install the package into debian/gambit. + dh_testdir + dh_testroot + dh_clean + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/gambit + dh_installchangelogs + dh_installdocs + dh_installexamples -Xsvn -XMakefile efg nfg + dh_installmenu + dh_installman debian/gambit.man + dh_install debian/gambit.xpm usr/share/pixmaps + dh_install debian/gambit.desktop usr/share/applications + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_shlibdeps + dh_installdeb + dh_gencontrol + dh_md5sums + +binary-indep: build install + # Build architecture-independent files: nothing to do. + +binary-arch: build install + # Build architecture-dependent files. + dh_testdir + dh_testroot + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- gambit-0.2006.01.20.orig/debian/docs +++ gambit-0.2006.01.20/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- gambit-0.2006.01.20.orig/debian/copyright +++ gambit-0.2006.01.20/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Peter van Rossum on +Wed, 26 Mar 2003 13:09:11 -0700. + +It was downloaded from http://econweb.tamu.edu/gambit/download.html. + +Upstream Author: The Gambit Project, Department of Economics, 4228 TAMU, +College Station TX 77843, USA, . + +Copyright: GNU General Public Licence. + +On Debian systems, the complete text of the GNU General Public Licence +can be found in /usr/share/common-licenses/GPL. + --- gambit-0.2006.01.20.orig/debian/links +++ gambit-0.2006.01.20/debian/links @@ -0,0 +1,14 @@ +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-enummixed.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-enumpoly.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-enumpure.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-gnm.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-ipa.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-lcp.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-liap.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-logit.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-lp.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-nfg2html.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-nfg2tex.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-nfg-logitdyn.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-nfg-mixdom.1 +/usr/share/man/man1/gambit.1 /usr/share/man/man1/gambit-simpdiv.1 --- gambit-0.2006.01.20.orig/sources/tools/convert/nfg2html.cc +++ gambit-0.2006.01.20/sources/tools/convert/nfg2html.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/convert/nfg2tex.cc +++ gambit-0.2006.01.20/sources/tools/convert/nfg2tex.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/rectangl.imp +++ gambit-0.2006.01.20/sources/tools/enumpoly/rectangl.imp @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include "rectangl.h" #include "odometer.h" --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/gpoly.imp +++ gambit-0.2006.01.20/sources/tools/enumpoly/gpoly.imp @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include "gpoly.h" #include "libgambit/libgambit.h" --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/odometer.h +++ gambit-0.2006.01.20/sources/tools/enumpoly/odometer.h @@ -37,6 +37,7 @@ #ifndef ODOMETER_H #define ODOMETER_H +#include #include "libgambit/libgambit.h" // ***************************** --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/nfghs.h +++ gambit-0.2006.01.20/sources/tools/enumpoly/nfghs.h @@ -56,8 +56,8 @@ void Initialize(Game game); void Cleanup(Game game); - void gbtNfgHs::SolveSizeDiff(Game game, Gambit::List < MixedStrategyProfile < double > > & solutions, - int size, int diff); + void SolveSizeDiff(Game game, Gambit::List < MixedStrategyProfile < double > > & solutions, + int size, int diff); bool SolveSupportSizeProfile(Game game, Gambit::List < MixedStrategyProfile < double > > & solutions, const Gambit::Array < int > & supportSizeProfile); --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/enumpoly.cc +++ gambit-0.2006.01.20/sources/tools/enumpoly/enumpoly.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include "libgambit/libgambit.h" --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/pelutils.cc +++ gambit-0.2006.01.20/sources/tools/enumpoly/pelutils.cc @@ -3215,7 +3215,7 @@ } level--; break; - case PROC: printf("%d",(int)node_get_ptr(N,LEFT)); + case PROC: printf("%ld",(long)node_get_ptr(N,LEFT)); break; default: printf("Unknown type %d in Node_Print\n", --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/poly.imp +++ gambit-0.2006.01.20/sources/tools/enumpoly/poly.imp @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include "poly.h" //-------------------------------------------------------------------------- --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/double.cc +++ gambit-0.2006.01.20/sources/tools/enumpoly/double.cc @@ -28,6 +28,8 @@ #pragma implementation #endif +#include +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/pelqhull.h +++ gambit-0.2006.01.20/sources/tools/enumpoly/pelqhull.h @@ -942,7 +942,7 @@ -SETempty_(set) - return true (1) if set is empty set may be NULL */ -#define SETreturnsize_(set, size) (((size)= (int)((set)->e[(set)->maxsize]))?(--(size)):((size)= (set)->maxsize)) +#define SETreturnsize_(set, size) (((size)= (long)((set)->e[(set)->maxsize]))?(--(size)):((size)= (set)->maxsize)) #define SETempty_(set) (!set || (SETfirst_(set) ? 0:1)) /* ======= -functions =========== --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/complex.cc +++ gambit-0.2006.01.20/sources/tools/enumpoly/complex.cc @@ -28,6 +28,7 @@ #pragma implementation #endif +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/pelqhull.cc +++ gambit-0.2006.01.20/sources/tools/enumpoly/pelqhull.cc @@ -121,7 +121,7 @@ if (!(object= malloc(outsize))) qhull_fatal(3); if (qhmem.IStracing >= 5) - fprintf (qhmem.ferr, "qh_memalloc long: %d bytes at %x\n", outsize, (int)object); + fprintf (qhmem.ferr, "qh_memalloc long: %d bytes at %p\n", outsize, object); } return (object); } /* memalloc */ @@ -148,7 +148,7 @@ qhmem .totlong -= size; free (object); if (qhmem.IStracing >= 5) - fprintf (qhmem.ferr, "qh_memfree long: %d bytes at %x\n", size, (int)object); + fprintf (qhmem.ferr, "qh_memfree long: %d bytes at %p\n", size, object); } } /* memfree */ @@ -519,10 +519,10 @@ if (!set || !(set->e[0])) return NULL; - if ((setsize= (int)*(last= &(set->e[set->maxsize])))) { + if ((setsize= (long)*(last= &(set->e[set->maxsize])))) { returnvalue= set->e[setsize - 2]; set->e[setsize - 2]= NULL; - *last= (void *)((int)*last - 1); + *last= (void *)((long)*last - 1); }else { returnvalue= set->e[set->maxsize - 1]; set->e[set->maxsize - 1]= NULL; @@ -939,11 +939,11 @@ else { SETreturnsize_(set, size); fprintf (fp, "%s set=%x maxsize=%d size=%d elems=", - string, (unsigned int)set, set->maxsize, size); + string, (unsigned long)set, set->maxsize, size); if (size > (int)set->maxsize) size= set->maxsize+1; for (k=0; ke[k])); + fprintf(fp, " %p", set->e[k]); fprintf(fp, "\n"); } } /* setprint */ @@ -998,8 +998,8 @@ newset= qh_setnew (setsize); qh_setappend ((setT **)&qhmem.tempstack, newset); if (qhmem.IStracing >= 5) - fprintf (qhmem.ferr, "qh_settemp: temp set %x of %d elements, depth %d\n", - (int)newset, newset->maxsize, qh_setsize ((setT *)qhmem.tempstack)); + fprintf (qhmem.ferr, "qh_settemp: temp set %p of %d elements, depth %d\n", + newset, newset->maxsize, qh_setsize ((setT *)qhmem.tempstack)); return newset; } /* settemp */ @@ -1043,8 +1043,8 @@ if (!stackedset) qhull_fatal(18); if (qhmem.IStracing >= 5) - fprintf (qhmem.ferr, "qh_settemppop: depth %d temp set %x of %d elements\n", - qh_setsize((setT *)qhmem.tempstack)+1, (int)stackedset, qh_setsize(stackedset)); + fprintf (qhmem.ferr, "qh_settemppop: depth %d temp set %p of %d elements\n", + qh_setsize((setT *)qhmem.tempstack)+1, stackedset, qh_setsize(stackedset)); return stackedset; } /* settemppop */ @@ -1056,8 +1056,8 @@ qh_setappend ((setT**)&qhmem.tempstack, set); if (qhmem.IStracing >= 5) - fprintf (qhmem.ferr, "qh_settemppush: depth %d temp set %x of %d elements\n", - qh_setsize((setT *)qhmem.tempstack), (int)set, qh_setsize(set)); + fprintf (qhmem.ferr, "qh_settemppush: depth %d temp set %p of %d elements\n", + qh_setsize((setT *)qhmem.tempstack), set, qh_setsize(set)); } /* settemppush */ @@ -4088,8 +4088,8 @@ vertex->seen= True; numvertices++; if (qh_pointid (vertex->point) == -1) { - fprintf (qh ferr, "qhull internal error (checkpolygon): unknown point %x for vertex v%d first_point %x\n", - (int) vertex->point, vertex->id, (int) qh first_point); + fprintf (qh ferr, "qhull internal error (checkpolygon): unknown point %p for vertex v%d first_point %p\n", + vertex->point, vertex->id, qh first_point); waserror= True; } } @@ -4152,7 +4152,7 @@ facetT *neighbor, **neighborp, *errfacet=NULL; if (qh_pointid (vertex->point) == -1) { - fprintf (qh ferr, "qhull internal error (checkvertex): unknown point id %x\n", (int) vertex->point); + fprintf (qh ferr, "qhull internal error (checkvertex): unknown point id %p\n", vertex->point); waserror= True; } if (vertex->id >= qh vertex_id) { @@ -4461,33 +4461,33 @@ switch (size-firstindex) { case 1: - hash= (unsigned)(*elemp) - (unsigned) skipelem; + hash= (unsigned long)(*elemp) - (unsigned long) skipelem; break; case 2: - hash= (unsigned)(*elemp) + (unsigned)elemp[1] - (unsigned) skipelem; + hash= (unsigned long)(*elemp) + (unsigned long)elemp[1] - (unsigned long) skipelem; break; case 3: - hash= (unsigned)(*elemp) + (unsigned)elemp[1] + (unsigned)elemp[2] - - (unsigned) skipelem; + hash= (unsigned long)(*elemp) + (unsigned long)elemp[1] + (unsigned long)elemp[2] + - (unsigned long) skipelem; break; case 4: - hash= (unsigned)(*elemp) + (unsigned)elemp[1] + (unsigned)elemp[2] - + (unsigned)elemp[3] - (unsigned) skipelem; + hash= (unsigned long)(*elemp) + (unsigned long)elemp[1] + (unsigned long)elemp[2] + + (unsigned long)elemp[3] - (unsigned long) skipelem; break; case 5: - hash= (unsigned)(*elemp) + (unsigned)elemp[1] + (unsigned)elemp[2] - + (unsigned)elemp[3] + (unsigned)elemp[4] - (unsigned) skipelem; + hash= (unsigned long)(*elemp) + (unsigned long)elemp[1] + (unsigned long)elemp[2] + + (unsigned long)elemp[3] + (unsigned long)elemp[4] - (unsigned long) skipelem; break; case 6: - hash= (unsigned)(*elemp) + (unsigned)elemp[1] + (unsigned)elemp[2] - + (unsigned)elemp[3] + (unsigned)elemp[4]+ (unsigned)elemp[5] - - (unsigned) skipelem; + hash= (unsigned long)(*elemp) + (unsigned long)elemp[1] + (unsigned long)elemp[2] + + (unsigned long)elemp[3] + (unsigned long)elemp[4]+ (unsigned long)elemp[5] + - (unsigned long) skipelem; break; default: hash= 0; i= 3; do { /* this is about 10% in 10-d */ - if ((elem= (unsigned)*elemp++) != (unsigned)skipelem) { + if ((elem= (unsigned long)*elemp++) != (unsigned long)skipelem) { hash ^= (elem << i) + (elem >> (32-i)); i += 3; if (i >= 32) @@ -5218,7 +5218,7 @@ if (id < 0) return NULL; if (id < qh num_points) - return ((pointT *)((unsigned)qh first_point+(unsigned)((id)*qh normal_size))); + return ((pointT *)((unsigned long)qh first_point+(unsigned long)((id)*qh normal_size))); id -= qh num_points; if (id < qh_setsize (qh other_points)) return (pointT *)SETelem_(qh other_points, id); @@ -5232,8 +5232,8 @@ int id; if ((id= qh_pointid(point)) == -1) - fprintf (qh ferr, "qhull internal warning (pointfacet,pointvertex): unknown point %ux\n", - (unsigned) point); + fprintf (qh ferr, "qhull internal warning (pointfacet,pointvertex): unknown point %p\n", + point); else SETelem_(set, id)= elem; } /* point_add */ @@ -5279,7 +5279,7 @@ if (!point) return -3; - id= ((unsigned) point - (unsigned) qh first_point)/qh normal_size; + id= ((unsigned long) point - (unsigned long) qh first_point)/qh normal_size; if ((int)id >= qh num_points) { if (point == qh interior_point) id= (unsigned int) -2; @@ -6774,8 +6774,8 @@ trace4((qh ferr, "qh_mergevertex_neighbors: merge vertex neighbors of f%d and f%d\n", facet1->id, facet2->id)); if (qh tracevertex) { - fprintf (qh ferr, "qh_mergevertex_neighbors: of f%d and f%d at furthest p%d f0= %x\n", - facet1->id, facet2->id, qh furthest_id, (int)qh tracevertex->neighbors->e[0]); + fprintf (qh ferr, "qh_mergevertex_neighbors: of f%d and f%d at furthest p%d f0= %p\n", + facet1->id, facet2->id, qh furthest_id, qh tracevertex->neighbors->e[0]); /* qh_errprint ("TRACE", NULL, NULL, NULL, qh tracevertex); --- gambit-0.2006.01.20.orig/sources/tools/enumpoly/linrcomb.cc +++ gambit-0.2006.01.20/sources/tools/enumpoly/linrcomb.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include "linrcomb.imp" #include #include --- gambit-0.2006.01.20.orig/sources/tools/liap/nfgliap.cc +++ gambit-0.2006.01.20/sources/tools/liap/nfgliap.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/liap/liap.cc +++ gambit-0.2006.01.20/sources/tools/liap/liap.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include "libgambit/libgambit.h" --- gambit-0.2006.01.20.orig/sources/tools/liap/efgliap.cc +++ gambit-0.2006.01.20/sources/tools/liap/efgliap.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/gt/cmatrix.cc +++ gambit-0.2006.01.20/sources/tools/gt/cmatrix.cc @@ -20,6 +20,7 @@ #include "cmatrix.h" #include "math.h" #include "float.h" +#include cvector::~cvector() { delete []x; } // adopted from NRiC, pg 45 --- gambit-0.2006.01.20.orig/sources/tools/gt/cmatrix.h +++ gambit-0.2006.01.20/sources/tools/gt/cmatrix.h @@ -24,6 +24,7 @@ #ifdef SOLARIS #include #endif +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/enummixed/enummixed.cc +++ gambit-0.2006.01.20/sources/tools/enummixed/enummixed.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/lcp/lcp.cc +++ gambit-0.2006.01.20/sources/tools/lcp/lcp.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include "libgambit/libgambit.h" --- gambit-0.2006.01.20.orig/sources/tools/lp/lp.cc +++ gambit-0.2006.01.20/sources/tools/lp/lp.cc @@ -25,6 +25,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include "libgambit/libgambit.h" --- gambit-0.2006.01.20.orig/sources/tools/simpdiv/nfgsimpdiv.cc +++ gambit-0.2006.01.20/sources/tools/simpdiv/nfgsimpdiv.cc @@ -24,6 +24,8 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/enumpure/enumpure.cc +++ gambit-0.2006.01.20/sources/tools/enumpure/enumpure.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include "libgambit/libgambit.h" --- gambit-0.2006.01.20.orig/sources/tools/logit/logit.cc +++ gambit-0.2006.01.20/sources/tools/logit/logit.cc @@ -24,6 +24,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/tools/logit/nfgdyn.cc +++ gambit-0.2006.01.20/sources/tools/logit/nfgdyn.cc @@ -25,6 +25,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +#include #include #include #include --- gambit-0.2006.01.20.orig/sources/libgambit/list.h +++ gambit-0.2006.01.20/sources/libgambit/list.h @@ -27,6 +27,8 @@ #ifndef LIBGAMBIT_LIST_H #define LIBGAMBIT_LIST_H +#include + namespace Gambit { template class List { --- gambit-0.2006.01.20.orig/sources/libgambit/integer.cc +++ gambit-0.2006.01.20/sources/libgambit/integer.cc @@ -39,6 +39,7 @@ */ #include +#include #if defined(__GNUG__) && !defined(__APPLE_CC__) #pragma implementation --- gambit-0.2006.01.20.orig/sources/labenski/src/fparser.cpp +++ gambit-0.2006.01.20/sources/labenski/src/fparser.cpp @@ -2386,8 +2386,8 @@ { //bool didsomething = true; - pit poslogpos = NULL; bool foundposlog = false; - pit neglogpos = NULL; bool foundneglog = false; + pit poslogpos; bool foundposlog = false; + pit neglogpos; bool foundneglog = false; ConstList cl = p1->BuildConstList();