summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2010-04-29 20:41:54 +0200
committerAndreas Baumann <abaumann@yahoo.com>2010-04-29 20:41:54 +0200
commitf35da36ed925d639a4828096be2f1499e43f9489 (patch)
tree48772998a4a276e31a80fcb382eeec1aa2ff910b
parente0548034c9b91a456fc52aa0d3aacde649cec8bc (diff)
downloadtvisiontest-f35da36ed925d639a4828096be2f1499e43f9489.tar.gz
tvisiontest-f35da36ed925d639a4828096be2f1499e43f9489.tar.bz2
made freebsd version compile on 4.5.0
-rw-r--r--freebsdtvision/lib/TResourceFile.cc4
-rw-r--r--freebsdtvision/lib/helpbase.cc2
-rw-r--r--freebsdtvision/lib/system.cc2
-rw-r--r--freebsdtvision/lib/tobjstrm.cc3
-rw-r--r--freebsdtvision/tutorial/load.cc1
-rw-r--r--freebsdtvision/tutorial/nomenus.cc2
-rw-r--r--freebsdtvision/tutorial/tvedit.cc2
7 files changed, 13 insertions, 3 deletions
diff --git a/freebsdtvision/lib/TResourceFile.cc b/freebsdtvision/lib/TResourceFile.cc
index 6b0470c..62b80f3 100644
--- a/freebsdtvision/lib/TResourceFile.cc
+++ b/freebsdtvision/lib/TResourceFile.cc
@@ -20,6 +20,8 @@
#include <ios>
+#include <cassert>
+
using std::ios;
using std::streampos;
@@ -60,7 +62,7 @@ TResourceFile::TResourceFile( fpstream *aStream )
int repeat;
do {
repeat = 0;
- if (basePos <= (streamSize - (long)sizeof(THeader)))
+ if (basePos <= ((int)streamSize - (long)sizeof(THeader)))
{
stream->seekg(basePos, ios::beg);
stream->readBytes(&header, sizeof(THeader));
diff --git a/freebsdtvision/lib/helpbase.cc b/freebsdtvision/lib/helpbase.cc
index bd3d696..4e7860c 100644
--- a/freebsdtvision/lib/helpbase.cc
+++ b/freebsdtvision/lib/helpbase.cc
@@ -588,7 +588,7 @@ THelpFile::~THelpFile(void)
streampos size = filelength(*stream);
size =- 8;
*stream << magic;
- *stream << size;
+ *stream << (int)size;
*stream << indexPos;
}
delete stream;
diff --git a/freebsdtvision/lib/system.cc b/freebsdtvision/lib/system.cc
index 4217b3f..ac4a52e 100644
--- a/freebsdtvision/lib/system.cc
+++ b/freebsdtvision/lib/system.cc
@@ -2341,7 +2341,7 @@ filelength(istream &s)
void
expandPath(const char path[], char *dir, char *file)
{
- char *tag = strrchr(path, '/');
+ const char *tag = strrchr(path, '/');
/* the path is in the form /dir1/dir2/file ? */
diff --git a/freebsdtvision/lib/tobjstrm.cc b/freebsdtvision/lib/tobjstrm.cc
index 87c8ce1..a23453c 100644
--- a/freebsdtvision/lib/tobjstrm.cc
+++ b/freebsdtvision/lib/tobjstrm.cc
@@ -33,6 +33,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#if defined __linux__
+#include <arpa/inet.h>
+#endif
extern "C" {
#include <sys/param.h>
diff --git a/freebsdtvision/tutorial/load.cc b/freebsdtvision/tutorial/load.cc
index caa9f57..37861cb 100644
--- a/freebsdtvision/tutorial/load.cc
+++ b/freebsdtvision/tutorial/load.cc
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
+#include <string.h>
#include <fstream>
diff --git a/freebsdtvision/tutorial/nomenus.cc b/freebsdtvision/tutorial/nomenus.cc
index 8ec9eda..08919c2 100644
--- a/freebsdtvision/tutorial/nomenus.cc
+++ b/freebsdtvision/tutorial/nomenus.cc
@@ -21,6 +21,8 @@
#include <tvision/tv.h>
+#include <string.h>
+
//define a custom background
class TMyBackground: public TBackground
diff --git a/freebsdtvision/tutorial/tvedit.cc b/freebsdtvision/tutorial/tvedit.cc
index f470d0c..38ca9d7 100644
--- a/freebsdtvision/tutorial/tvedit.cc
+++ b/freebsdtvision/tutorial/tvedit.cc
@@ -30,6 +30,8 @@
#define Uses_TSubMenu
#include <tvision/tv.h>
+#include <assert.h>
+
extern "C" {
#include <signal.h>
}