Fresco/Prague/include/Prague/IPC ipcbuf.hh,1.15,1.16 sockbuf.hh,1.14,1.15
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Prague/include/Prague/IPC
In directory purcel:/tmp/cvs-serv19338/include/Prague/IPC
Modified Files:
ipcbuf.hh sockbuf.hh
Log Message:
fixes/portability (IRIX)
Index: ipcbuf.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Prague/include/Prague/IPC/ipcbuf.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ipcbuf.hh 5 Mar 2003 21:25:25 -0000 1.15
+++ ipcbuf.hh 29 Apr 2003 21:19:10 -0000 1.16
@@ -22,8 +22,7 @@
#ifndef _Prague_ipcbuf_hh
#define _Prague_ipcbuf_hh
-#include <Prague/Sys/Tracer.hh>
-#include <Prague/Sys/Thread.hh>
+#include <ios>
#include <streambuf>
namespace Prague
@@ -76,7 +75,7 @@
//. flush the buffer
virtual int sync();
//. return the number of chars in the input sequence
- virtual int showmanyc() const;
+ virtual int showmanyc();
//. if pbase () == 0, no write is allowed and thus return EOF.
//. if c == EOF, we sync the output and return 0.
//. if pptr () == epptr (), buffer is full and thus sync the output, insert c into buffer, and return c.
@@ -94,6 +93,6 @@
bool _eofbit : 1; // connection closed
};
-};
+}
#endif
Index: sockbuf.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Prague/include/Prague/IPC/sockbuf.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sockbuf.hh 24 Feb 2003 22:50:48 -0000 1.14
+++ sockbuf.hh 29 Apr 2003 21:19:10 -0000 1.15
@@ -129,59 +129,61 @@
public:
enum domain
{
- af_unix = AF_UNIX,
- af_inet4 = AF_INET,
+ af_unix = AF_UNIX,
+ af_inet4 = AF_INET,
#ifdef AF_INET6
- af_inet6 = AF_INET6,
+ af_inet6 = AF_INET6,
+#endif
+#ifdef AF_IPX
+ af_ipx = AF_IPX,
#endif
- af_ipx = AF_IPX,
#ifdef AF_NETLINK
- af_netlink = AF_NETLINK,
+ af_netlink = AF_NETLINK,
#endif
#ifdef AF_X25
- af_x25 = AF_X25,
+ af_x25 = AF_X25,
#endif
#ifdef AF_AX25
- af_ax25 = AF_AX25,
+ af_ax25 = AF_AX25,
#endif
#ifdef AF_ATMPVC
- af_atmpvc = AF_ATMPVC,
+ af_atmpvc = AF_ATMPVC,
#endif
#ifdef AF_PACKET
- af_packet = AF_PACKET,
+ af_packet = AF_PACKET,
#endif
- af_appletalk = AF_APPLETALK
+ af_appletalk = AF_APPLETALK
};
enum type
{
- sock_stream = SOCK_STREAM,
- sock_dgram = SOCK_DGRAM,
- sock_raw = SOCK_RAW,
- sock_rdm = SOCK_RDM,
- sock_seqpacket = SOCK_SEQPACKET
+ sock_stream = SOCK_STREAM,
+ sock_dgram = SOCK_DGRAM,
+ sock_raw = SOCK_RAW,
+ sock_rdm = SOCK_RDM,
+ sock_seqpacket = SOCK_SEQPACKET
};
enum option
{
- so_debug = SO_DEBUG,
+ so_debug = SO_DEBUG,
so_reuseaddr = SO_REUSEADDR,
so_keepalive = SO_KEEPALIVE,
so_dontroute = SO_DONTROUTE,
so_broadcast = SO_BROADCAST,
- so_linger = SO_LINGER,
+ so_linger = SO_LINGER,
so_oobinline = SO_OOBINLINE,
so_sndbuf = SO_SNDBUF,
so_rcvbuf = SO_RCVBUF,
so_error = SO_ERROR,
- so_type = SO_TYPE
+ so_type = SO_TYPE
};
enum level
{
- sol_socket = SOL_SOCKET
+ sol_socket = SOL_SOCKET
};
enum msgflag
{
- msg_oob = MSG_OOB,
- msg_peek = MSG_PEEK,
+ msg_oob = MSG_OOB,
+ msg_peek = MSG_PEEK,
msg_dontroute = MSG_DONTROUTE,
msg_maxiovlen = MSG_MAXIOVLEN