summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/Handle.h4
-rw-r--r--includes/Image.h5
-rw-r--r--includes/Input.h3
-rw-r--r--includes/Output.h3
-rw-r--r--includes/String.h2
5 files changed, 15 insertions, 2 deletions
diff --git a/includes/Handle.h b/includes/Handle.h
index 6e26e9c..fdaea2c 100644
--- a/includes/Handle.h
+++ b/includes/Handle.h
@@ -22,6 +22,9 @@ class Handle : public Base {
void SetNonBlock(void);
virtual bool CanRead();
virtual bool CanWrite();
+ virtual bool CanSeek();
+ virtual off_t seek(off_t, int) throw (GeneralException);
+ virtual off_t tell();
virtual String GetName();
virtual ssize_t GetSize();
virtual time_t GetModif();
@@ -39,6 +42,7 @@ class Handle : public Base {
bool closed, nonblock;
gzFile zfile;
int z;
+ off_t itell;
};
Handle & operator<<(Handle &, const String &);
diff --git a/includes/Image.h b/includes/Image.h
index 8dc6788..fc94a12 100644
--- a/includes/Image.h
+++ b/includes/Image.h
@@ -3,6 +3,7 @@
#ifdef __cplusplus
#include <Buffer.h>
+#include <generic.h>
enum {
FORMAT_TGA_BASIC
@@ -42,13 +43,13 @@ class Image : public Buffer {
Word IS_Height;
Byte IS_Depth;
Byte IS_Descriptor;
- } __attribute__((packed));
+ } PACKED;
struct TGAFooter {
DWord ExtOffset;
DWord DevOffset;
char Sig[18];
- } __attribute__((packed));
+ } PACKED;
unsigned int x, y;
bool r;
diff --git a/includes/Input.h b/includes/Input.h
index 7091258..f8cf9be 100644
--- a/includes/Input.h
+++ b/includes/Input.h
@@ -14,6 +14,9 @@ class Input : public Handle {
virtual ~Input() {}
virtual bool CanWrite();
virtual bool CanRead();
+ virtual bool CanSeek();
+ virtual off_t seek(off_t, int) throw (GeneralException);
+ virtual off_t tell();
virtual String GetName();
virtual ssize_t GetSize();
virtual time_t GetModif();
diff --git a/includes/Output.h b/includes/Output.h
index 32d4e66..ef6806c 100644
--- a/includes/Output.h
+++ b/includes/Output.h
@@ -12,6 +12,9 @@ class Output : public Handle {
virtual ~Output() {}
virtual bool CanWrite();
virtual bool CanRead();
+ virtual bool CanSeek();
+ virtual off_t seek(off_t, int) throw (GeneralException);
+ virtual off_t tell();
virtual String GetName();
protected:
diff --git a/includes/String.h b/includes/String.h
index f8db2c7..1fd6183 100644
--- a/includes/String.h
+++ b/includes/String.h
@@ -13,8 +13,10 @@ class String : public Base {
String(char);
String(int);
String(unsigned int);
+#ifdef USE_LONGLONG
String(long long);
String(unsigned long long);
+#endif
String(double);
~String();
const char * set(const char *, ...);