|
From: <wsh...@us...> - 2003-08-26 00:39:57
|
Update of /cvsroot/emc/rcslib/src/nt_xdr
In directory sc8-pr-cvs1:/tmp/cvs-serv4684/src/nt_xdr
Modified Files:
Tag: wps_multiplat_dev_branch
xdr.h xdr_rec.c xdrtypes.h
Log Message:
.
Index: xdr.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/nt_xdr/xdr.h,v
retrieving revision 4.33.2.1
retrieving revision 4.33.2.2
diff -C2 -d -r4.33.2.1 -r4.33.2.2
*** xdr.h 21 Aug 2003 20:24:15 -0000 4.33.2.1
--- xdr.h 26 Aug 2003 00:39:44 -0000 4.33.2.2
***************
*** 54,57 ****
--- 54,60 ----
#endif
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
// The file was originally types.h but I changed the name to
***************
*** 353,356 ****
--- 356,363 ----
extern bool_t xdrrec_skiprecord(); /* move to beginning of next record */
extern bool_t xdrrec_eof(); /* true if no more input */
+
+ #ifdef __cplusplus
+ }
+ #endif
#endif /* __XDR_HEADER__ */
Index: xdr_rec.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/nt_xdr/xdr_rec.c,v
retrieving revision 4.32.2.2
retrieving revision 4.32.2.3
diff -C2 -d -r4.32.2.2 -r4.32.2.3
*** xdr_rec.c 22 Aug 2003 03:34:27 -0000 4.32.2.2
--- xdr_rec.c 26 Aug 2003 00:39:44 -0000 4.32.2.3
***************
*** 136,139 ****
--- 136,144 ----
} RECSTREAM;
+ static bool_t flush_out(register RECSTREAM *rstrm, bool_t eor);
+ static bool_t get_input_bytes(register RECSTREAM *rstrm,register caddr_t addr,register int len);
+ static bool_t set_input_fragment(register RECSTREAM *rstrm);
+ static bool_t skip_input_bytes(register RECSTREAM *rstrm,long cnt);
+
/*
***************
*** 502,508 ****
*/
static bool_t
! flush_out(rstrm, eor)
! register RECSTREAM *rstrm;
! bool_t eor;
{
register u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
--- 507,512 ----
*/
static bool_t
! flush_out(register RECSTREAM *rstrm,
! bool_t eor)
{
register u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
***************
*** 540,548 ****
}
! static bool_t /* knows nothing about records! Only about input buffers */
! get_input_bytes(rstrm, addr, len)
! register RECSTREAM *rstrm;
! register caddr_t addr;
! register int len;
{
register int current;
--- 544,553 ----
}
! /* knows nothing about records! Only about input buffers */
! static bool_t
! get_input_bytes(
! register RECSTREAM *rstrm,
! register caddr_t addr,
! register int len)
{
register int current;
***************
*** 564,570 ****
}
! static bool_t /* next two bytes of the input stream are treated as a header */
! set_input_fragment(rstrm)
! register RECSTREAM *rstrm;
{
u_long header;
--- 569,576 ----
}
! /* next two bytes of the input stream are treated as a header */
! static bool_t
! set_input_fragment(
! register RECSTREAM *rstrm)
{
u_long header;
***************
*** 578,585 ****
}
! static bool_t /* consumes input bytes; knows nothing about records! */
! skip_input_bytes(rstrm, cnt)
! register RECSTREAM *rstrm;
! long cnt;
{
register int current;
--- 584,590 ----
}
! /* consumes input bytes; knows nothing about records! */
! static bool_t
! skip_input_bytes(register RECSTREAM *rstrm,long cnt)
{
register int current;
Index: xdrtypes.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/nt_xdr/xdrtypes.h,v
retrieving revision 4.33.2.1
retrieving revision 4.33.2.2
diff -C2 -d -r4.33.2.1 -r4.33.2.2
*** xdrtypes.h 21 Aug 2003 20:24:15 -0000 4.33.2.1
--- xdrtypes.h 26 Aug 2003 00:39:44 -0000 4.33.2.2
***************
*** 90,95 ****
#endif
! #ifndef HAVE__CADDR_T
typedef char *caddr_t;
#endif
#ifndef mingw32
--- 90,96 ----
#endif
! #if !defined(HAVE_CADDR_T_TYPE) && !defined(CADDR_T_DEFINED) && !defined(HAVE__CADDR_T)
typedef char *caddr_t;
+ #define CADDR_T_DEFINED
#endif
#ifndef mingw32
|