Undo labeling of elements of rx structures for Windows

Change I006bbbdb8923dbb72a97fde931a1b23e303375c2 broke
the Windows build.  Restore the unlabled assignments for
Windows since Windows always uses the AFS xdr implementation.

Change-Id: I2eadc624d84f4100281424993b7287a330d6c753
Reviewed-on: http://gerrit.openafs.org/1136
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c
index eeffd76d4219435048e7ec8c391fbd25da66173b..44c2aa179bee71843332edd1b7236355b07fd403 100644 (file)
--- a/src/rx/xdr_mem.c
+++ b/src/rx/xdr_mem.c
@@ -60,6 +60,17 @@ static afs_int32 *xdrmem_inline();
 static void xdrmem_destroy();
 
 static struct xdr_ops xdrmem_ops = {
+#ifdef AFS_NT40_ENV
+    /* Windows does not support labeled assigments */
+    xdrmem_getint32,    /* deserialize an afs_int32 */
+    xdrmem_putint32,    /* serialize an afs_int32 */
+    xdrmem_getbytes,    /* deserialize counted bytes */
+    xdrmem_putbytes,    /* serialize counted bytes */
+    xdrmem_getpos,      /* get offset in the stream: not supported. */
+    xdrmem_setpos,      /* set offset in the stream: not supported. */
+    xdrmem_inline,      /* prime stream for inline macros */
+    xdrmem_destroy      /* destroy stream */
+#else
     .x_getint32 = xdrmem_getint32,
     .x_putint32 = xdrmem_putint32,
     .x_getbytes = xdrmem_getbytes,
@@ -68,6 +79,7 @@ static struct xdr_ops xdrmem_ops = {
     .x_setpos = xdrmem_setpos,
     .x_inline = xdrmem_inline,
     .x_destroy = xdrmem_destroy
+#endif
 };
 
 /*

diff --git a/src/rx/xdr_rec.c b/src/rx/xdr_rec.c
index d19f763a6a3adb562dec6abe887fe91951f626bd..885e6beed41f60353051cc775fbf8bb0724517eb 100644 (file)
--- a/src/rx/xdr_rec.c
+++ b/src/rx/xdr_rec.c
@@ -117,6 +117,17 @@ static bool_t skip_input_bytes(RECSTREAM * rstrm, int cnt);
 static u_int fix_buf_size(u_int s);
 
 static struct xdr_ops xdrrec_ops = {
+#ifdef AFS_NT40_ENV
+    /* Windows does not support labeled assignments */
+    xdrrec_getint32,    /* deserialize an afs_int32 */
+    xdrrec_putint32,    /* serialize an afs_int32 */
+    xdrrec_getbytes,    /* deserialize counted bytes */
+    xdrrec_putbytes,    /* serialize counted bytes */
+    xdrrec_getpos,      /* get offset in the stream: not supported. */
+    xdrrec_setpos,      /* set offset in the stream: not supported. */
+    xdrrec_inline,      /* prime stream for inline macros */
+    xdrrec_destroy      /* destroy stream */
+#else
     .x_getint32 = xdrrec_getint32,
     .x_putint32 = xdrrec_putint32,
     .x_getbytes = xdrrec_getbytes,
@@ -125,6 +136,7 @@ static struct xdr_ops xdrrec_ops = {
     .x_setpos = xdrrec_setpos,
     .x_inline = xdrrec_inline,
     .x_destroy = xdrrec_destroy
+#endif
 };
 
 /*  * Create an xdr handle for xdrrec

diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index 8835f93c98a63356b0143f9677094b37b0362d12..0aa7eed28d4ed371b4821f429d4950c7572df2bd 100644 (file)
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -114,6 +114,17 @@ static AFS_RPC_INLINE_T *xdrrx_inline(AFS_XDRS_T axdrs, u_int len);
  * Ops vector for stdio type XDR
  */
 static struct xdr_ops xdrrx_ops = {
+#ifdef AFS_NT40_ENV
+    /* Windows does not support labeled assigments */
+    xdrrx_getint32,    /* deserialize an afs_int32 */
+    xdrrx_putint32,    /* serialize an afs_int32 */
+    xdrrx_getbytes,    /* deserialize counted bytes */
+    xdrrx_putbytes,    /* serialize counted bytes */
+    NULL,              /* get offset in the stream: not supported. */
+    NULL,              /* set offset in the stream: not supported. */
+    xdrrx_inline,      /* prime stream for inline macros */
+    NULL               /* destroy stream */
+#else
 #if defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV))
     .x_getint64 = xdrrx_getint64,
     .x_putint64 = xdrrx_putint64,
@@ -136,6 +147,7 @@ static struct xdr_ops xdrrx_ops = {
     .x_getint32 = xdrrx_getint32,      /* deserialize an afs_int32 */
     .x_putint32 = xdrrx_putint32,      /* serialize an afs_int32 */
 #endif
+#endif
 };
 
 /*

diff --git a/src/rx/xdr_stdio.c b/src/rx/xdr_stdio.c
index 0b24f45bf8989ef4dac0216b4a0d49da89e810b0..f5886fa36f980df5a258aa41b56c93e5da6adf53 100644 (file)
--- a/src/rx/xdr_stdio.c
+++ b/src/rx/xdr_stdio.c
@@ -58,6 +58,17 @@ static void xdrstdio_destroy();
  * Ops vector for stdio type XDR
  */
 static struct xdr_ops xdrstdio_ops = {
+#ifdef AFS_NT40_ENV
+    /* Windows does not support labeled assignments */
+    xdrstdio_getint32,         /* deserialize an afs_int32 */
+    xdrstdio_putint32,         /* serialize an afs_int32 */
+    xdrstdio_getbytes,         /* deserialize counted bytes */
+    xdrstdio_putbytes,         /* serialize counted bytes */
+    xdrstdio_getpos,           /* get offset in the stream */
+    xdrstdio_setpos,           /* set offset in the stream */
+    xdrstdio_inline,           /* prime stream for inline macros */
+    xdrstdio_destroy           /* destroy stream */
+#else
     .x_getint32 = xdrstdio_getint32,   /* deserialize an afs_int32 */
     .x_putint32 = xdrstdio_putint32,   /* serialize an afs_int32 */
     .x_getbytes = xdrstdio_getbytes,   /* deserialize counted bytes */
@@ -66,6 +77,7 @@ static struct xdr_ops xdrstdio_ops = {
     .x_setpos = xdrstdio_setpos,       /* set offset in the stream */
     .x_inline = xdrstdio_inline,       /* prime stream for inline macros */
     .x_destroy = xdrstdio_destroy      /* destroy stream */
+#endif
 };
 
 /*