Mon Nov 29 11:17:35 1999 H.J. Lu <hjl@lucon.org>

[nfs-utils.git] / tools / rpcgen / rpc_main.c

diff --git a/tools/rpcgen/rpc_main.c b/tools/rpcgen/rpc_main.c
index bd1a2c0d225d3b59dfa241beb693e1b329f6a2ba..39b667e1dd7d0ac56c8cdf2e9bb1c75da45269c9 100644 (file)
--- a/tools/rpcgen/rpc_main.c
+++ b/tools/rpcgen/rpc_main.c
@@ -426,12 +426,12 @@ c_initialize(void)
   /* add all the starting basic types */
 
   add_type(1,"int");
-  add_type(1,"long");
+  add_type(1,"int32_t");
   add_type(1,"short");
   add_type(1,"bool");
 
   add_type(1,"u_int");
-  add_type(1,"u_long");
+  add_type(1,"u_int32_t");
   add_type(1,"u_short");
 
 }
@@ -488,6 +488,19 @@ h_output(char *infile, char *define, int extend, char *outfile)
 
        f_print(fout, "#include <rpc/rpc.h>\n\n");
 
+       f_print(fout, "#ifndef IXDR_GET_INT32\n");
+       f_print(fout, "#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))\n");
+       f_print(fout, "#endif\n");
+       f_print(fout, "#ifndef IXDR_PUT_INT32\n");
+       f_print(fout, "#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))\n");
+       f_print(fout, "#endif\n");
+       f_print(fout, "#ifndef IXDR_GET_U_INT32\n");
+       f_print(fout, "#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))\n");
+       f_print(fout, "#endif\n");
+       f_print(fout, "#ifndef IXDR_PUT_U_INT32\n");
+       f_print(fout, "#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))\n");
+       f_print(fout, "#endif\n");
+
        tell = ftell(fout);
        /* print data definitions */
        while ((def = get_definition()) != NULL) {