diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/BLua.h | 3 | ||||
| -rw-r--r-- | include/BString.h | 3 | ||||
| -rw-r--r-- | include/CopyJob.h | 4 | ||||
| -rw-r--r-- | include/Handle.h | 6 | ||||
| -rw-r--r-- | include/LuaHandle.h | 3 | ||||
| -rw-r--r-- | include/Socket.h | 7 | ||||
| -rw-r--r-- | include/Task.h | 2 | ||||
| -rw-r--r-- | include/TaskMan.h | 4 |
8 files changed, 27 insertions, 5 deletions
diff --git a/include/BLua.h b/include/BLua.h index baaf9db..77c3a9d 100644 --- a/include/BLua.h +++ b/include/BLua.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: BLua.h,v 1.26 2005-12-01 14:29:20 pixel Exp $ */ +/* $Id: BLua.h,v 1.27 2006-01-31 17:02:38 pixel Exp $ */ #ifndef __BLUA_H__ #define __BLUA_H__ @@ -92,6 +92,7 @@ class Lua : public Base { lua_CFunction tocfunction(int = -1); void * touserdata(int = -1); Lua * tothread(int = -1); + String escape_string(const String &); void load(Handle *, bool docall = true) throw (GeneralException); void dump(Handle *, bool strip = true); void dumpvars(Handle *, const String &, int = -1); diff --git a/include/BString.h b/include/BString.h index 2809822..e9b0270 100644 --- a/include/BString.h +++ b/include/BString.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: BString.h,v 1.12 2004-11-27 21:46:02 pixel Exp $ */ +/* $Id: BString.h,v 1.13 2006-01-31 17:02:38 pixel Exp $ */ #ifndef __STRING_H__ #define __STRING_H__ @@ -85,6 +85,7 @@ class String : public Base { operator ugly_string() const; String & toupper(); String & tolower(); + String & iconv(const String & from, const String & to); private: String(int hs, char *); diff --git a/include/CopyJob.h b/include/CopyJob.h index 7284b24..40ff98d 100644 --- a/include/CopyJob.h +++ b/include/CopyJob.h @@ -1,7 +1,11 @@ #ifndef __COPYJOB_H__ #define __COPYJOB_H__ +#ifndef _WIN32 #include <sys/time.h> +#else +#include <windows.h> +#endif #include <Task.h> #include <Handle.h> diff --git a/include/Handle.h b/include/Handle.h index 9b6f88d..4223cf9 100644 --- a/include/Handle.h +++ b/include/Handle.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Handle.h,v 1.34 2004-11-27 21:46:02 pixel Exp $ */ +/* $Id: Handle.h,v 1.35 2006-01-31 17:02:38 pixel Exp $ */ #ifndef __HANDLE_H__ #define __HANDLE_H__ @@ -70,6 +70,10 @@ class Handle : public Base { int GetHandle() const; off_t itell; void * hFile; + virtual ssize_t nwrite(const void *, size_t) throw (GeneralException); + virtual ssize_t nread(void *, size_t) throw (GeneralException); + virtual int ndup() const throw (GeneralException); + virtual int nclose() throw (GeneralException); private: ssize_t uwrite(const void *, size_t) throw (GeneralException); ssize_t uread(void *, size_t); diff --git a/include/LuaHandle.h b/include/LuaHandle.h index ed31593..e7f94ef 100644 --- a/include/LuaHandle.h +++ b/include/LuaHandle.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: LuaHandle.h,v 1.8 2004-11-27 21:46:03 pixel Exp $ */ +/* $Id: LuaHandle.h,v 1.9 2006-01-31 17:02:38 pixel Exp $ */ #ifndef __LUAHANDLE_H__ #define __LUAHANDLE_H__ @@ -30,6 +30,7 @@ class LuaHandle : public LuaObject { public: + static void pushconstruct(Lua *); LuaHandle(Handle *); protected: virtual void pushmembers(Lua *); diff --git a/include/Socket.h b/include/Socket.h index 245ed9e..77bfedd 100644 --- a/include/Socket.h +++ b/include/Socket.h @@ -11,7 +11,7 @@ class Socket : public Handle { public: Socket() throw (GeneralException); Socket(const Socket &); - virtual ~Socket() {} + virtual ~Socket() { close(); } bool SetLocal(const String &, int = 0); bool Connect(const String &, int); bool Listen(); @@ -24,6 +24,11 @@ class Socket : public Handle { int GetPort(); void CloseWrite(); void CloseRead(); + protected: + virtual ssize_t nwrite(const void *, size_t) throw (GeneralException); + virtual ssize_t nread(void *, size_t) throw (GeneralException); + virtual int ndup() const throw (GeneralException); + virtual int nclose() throw (GeneralException); private: Socket(int s); diff --git a/include/Task.h b/include/Task.h index 9c966a3..5ac4a26 100644 --- a/include/Task.h +++ b/include/Task.h @@ -1,8 +1,10 @@ #ifndef __TASK_H__ #define __TASK_H__ +#ifndef _WIN32 #include <unistd.h> #include <sys/time.h> +#endif #include <vector> #include <Exceptions.h> #include <Handle.h> diff --git a/include/TaskMan.h b/include/TaskMan.h index 128339f..5d7d034 100644 --- a/include/TaskMan.h +++ b/include/TaskMan.h @@ -1,6 +1,10 @@ #ifndef __TASKMAN_H__ #define __TASKMAN_H__ +#ifdef _WIN32 +typedef int sigset_t; +#endif + #include <signal.h> #include <Task.h> #include <vector> |