patch-tools_rpcgen_rpc_main_c 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. --- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_main.c 2010-09-28 14:24:16.000000000 +0200
  2. +++ nfs-utils-1.2.3/tools/rpcgen/rpc_main.c 2010-12-24 23:45:11.000000000 +0100
  3. @@ -155,11 +155,7 @@ int timerflag; /* TRUE if !indefinite &
  4. int newstyle; /* newstyle of passing arguments (by value) */
  5. int Cflag = 0 ; /* ANSI C syntax */
  6. static int allfiles; /* generate all files */
  7. -#ifdef linux
  8. int tirpcflag = 0; /* no tirpc by default */
  9. -#else
  10. -int tirpcflag = 1; /* generating code for tirpc, by default */
  11. -#endif
  12. int
  13. main(int argc, char **argv)
  14. @@ -543,13 +539,8 @@ s_output(int argc, char **argv, char *in
  15. timerflag = 1;
  16. }
  17. -#ifndef linux
  18. - if( !tirpcflag && inetdflag )
  19. - f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
  20. -#else
  21. if( !tirpcflag )
  22. f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
  23. -#endif
  24. if( Cflag && (inetdflag || pmflag ) ) {
  25. f_print(fout, "#ifdef __cplusplus\n");
  26. f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n");
  27. @@ -562,9 +553,6 @@ s_output(int argc, char **argv, char *in
  28. f_print(fout, "#include <sys/types.h>\n");
  29. f_print(fout, "#include <memory.h>\n");
  30. -#ifndef linux
  31. - f_print(fout, "#include <stropts.h>\n");
  32. -#endif
  33. if (inetdflag || !tirpcflag ) {
  34. f_print(fout, "#include <sys/socket.h>\n");
  35. f_print(fout, "#include <netinet/in.h>\n");