diff options
| author | pixel <pixel> | 2006-11-14 10:10:10 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2006-11-14 10:10:10 +0000 |
| commit | 3ca22b7d558b948f6bf60c5ff3cf0c1a0630c42c (patch) | |
| tree | 03bb396811e73db1aa476ba865e6c93c550615e7 /include | |
| parent | fb4703fddb26291afcc3765a92814885ee9102c9 (diff) | |
Various compilation fixes, mostly side effects from the win32 backport.
Diffstat (limited to 'include')
| -rw-r--r-- | include/Handle.h | 3 | ||||
| -rw-r--r-- | include/Socket.h | 2 | ||||
| -rw-r--r-- | include/TaskMan.h | 2 | ||||
| -rw-r--r-- | include/gettext.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/include/Handle.h b/include/Handle.h index 4223cf9..6628013 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.35 2006-01-31 17:02:38 pixel Exp $ */ +/* $Id: Handle.h,v 1.36 2006-11-14 10:10:10 pixel Exp $ */ #ifndef __HANDLE_H__ #define __HANDLE_H__ @@ -74,6 +74,7 @@ class Handle : public Base { virtual ssize_t nread(void *, size_t) throw (GeneralException); virtual int ndup() const throw (GeneralException); virtual int nclose() throw (GeneralException); + void tagclose(); private: ssize_t uwrite(const void *, size_t) throw (GeneralException); ssize_t uread(void *, size_t); diff --git a/include/Socket.h b/include/Socket.h index 77bfedd..4c79237 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() { close(); } + virtual ~Socket() { if (!IsClosed()) { nclose(); tagclose(); } } bool SetLocal(const String &, int = 0); bool Connect(const String &, int); bool Listen(); diff --git a/include/TaskMan.h b/include/TaskMan.h index 7ceba4a..4470778 100644 --- a/include/TaskMan.h +++ b/include/TaskMan.h @@ -27,6 +27,7 @@ class TaskMan : public Base { static Handle * Ehandle(); static int Eprocess(); static int Estatus(); + static void SigChild(); class w4ha_t { public: @@ -70,7 +71,6 @@ class TaskMan : public Base { static sigset_t sigchildset; static int got_sigchild; static bool CheckDead(Task *); - static void SigChild(); }; #endif diff --git a/include/gettext.h b/include/gettext.h index de7395c..6cb591a 100644 --- a/include/gettext.h +++ b/include/gettext.h @@ -45,7 +45,9 @@ # define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) # define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) # define setlocale(category, locale) +#ifndef LC_ALL # define LC_ALL 0 +#endif #endif |