make-xdr-int64-support-consistent-now-that-its-everywhere-20010530

"an mr-afs related patch introduced xdr_afs_int64 into the code. This is a
good thing I suppose. The same patch also re-introduced the use of
xdr_long on some platforms, which isn't needed, and isn't really
appropriate. Said patch also only included the #defines for xdr_afs_int64
into rpc_main.c and not xdr.h. (it is my opinion that
rpc_main.c:write_int32_macros should only be used if kflag is set, but
transarc didn't do it that way, so I'm not going to change it)"

diff --git a/src/rx/xdr.h b/src/rx/xdr.h
index da79801..c74a8f0 100644 (file)
--- a/src/rx/xdr.h
+++ b/src/rx/xdr.h
@@ -328,14 +328,16 @@ extern bool_t xdrrec_eof();               /* true iff no more input */
  */
 
 #ifndef xdr_afs_int32
-#ifdef  AFS_64BIT_ENV
 #define xdr_afs_int32 xdr_int
-#else
-#define xdr_afs_int32 xdr_long
-#endif
 #endif
 #ifndef xdr_afs_uint32
 #define xdr_afs_uint32 xdr_u_int
 #endif
+#ifndef xdr_afs_int64
+#define xdr_afs_int64 xdr_int64
+#endif
+#ifndef xdr_afs_uint64
+#define xdr_afs_uint64 xdr_uint64
+#endif
 
 #endif /* __XDR_INCLUDE__ */

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index e96aba4..640f81e 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -246,11 +246,7 @@ write_int32_macros(fout)
 
 #if (INT_MAX == 0x7FFFFFFF) && (UINT_MAX == 0xFFFFFFFFu)
        f_print(fout, "#ifndef xdr_afs_int32\n");
-       f_print(fout, "#ifdef AFS_64BIT_ENV\n");
        f_print(fout, "#define xdr_afs_int32 xdr_int\n");
-       f_print(fout, "#else\n");
-       f_print(fout, "#define xdr_afs_int32 xdr_long\n");
-       f_print(fout, "#endif\n");
        f_print(fout, "#endif\n");
        f_print(fout, "#ifndef xdr_afs_uint32\n");
        f_print(fout, "#define xdr_afs_uint32 xdr_u_int\n");