pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for more libtirpc cleanup, fix umount issues, ARM64 work+misc, 2025-09-03
Posted by Anonymous on Wed 3rd Sep 2025 18:34
raw | new post

  1. From bcec904653be0222be13a25f442bbc846fbd5dc7 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Wed, 3 Sep 2025 11:23:44 +0200
  4. Subject: [PATCH 1/5] build.vc19,sys: Replace
  5.  |__security_push_cookie()|+|__security_pop_cookie()| hack with libcntpr.lib
  6.  
  7. Replace |__security_push_cookie()|+|__security_pop_cookie()| hack with
  8. libcntpr.lib.
  9.  
  10. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  11. ---
  12. build.vc19/nfs41_driver/nfs41_driver.vcxproj | 12 ++++++------
  13.  sys/copysup.c                                | 13 -------------
  14.  2 files changed, 6 insertions(+), 19 deletions(-)
  15.  
  16. diff --git a/build.vc19/nfs41_driver/nfs41_driver.vcxproj b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  17. index cc365c5..0a461e5 100644
  18. --- a/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  19. +++ b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  20. @@ -118,7 +118,7 @@
  21.        <WholeProgramOptimization>false</WholeProgramOptimization>
  22.      </ClCompile>
  23.      <Link>
  24. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  25. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
  26.      </Link>
  27.    </ItemDefinitionGroup>
  28.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
  29. @@ -134,7 +134,7 @@
  30.        <WholeProgramOptimization>true</WholeProgramOptimization>
  31.      </ClCompile>
  32.      <Link>
  33. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  34. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
  35.        <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
  36.      </Link>
  37.    </ItemDefinitionGroup>
  38. @@ -151,7 +151,7 @@
  39.        <WholeProgramOptimization>false</WholeProgramOptimization>
  40.      </ClCompile>
  41.      <Link>
  42. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  43. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
  44.      </Link>
  45.      <DriverSign>
  46.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  47. @@ -170,7 +170,7 @@
  48.        <WholeProgramOptimization>true</WholeProgramOptimization>
  49.      </ClCompile>
  50.      <Link>
  51. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  52. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
  53.        <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
  54.      </Link>
  55.      <DriverSign>
  56. @@ -190,7 +190,7 @@
  57.        <WholeProgramOptimization>false</WholeProgramOptimization>
  58.      </ClCompile>
  59.      <Link>
  60. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  61. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
  62.      </Link>
  63.      <DriverSign>
  64.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  65. @@ -209,7 +209,7 @@
  66.        <WholeProgramOptimization>true</WholeProgramOptimization>
  67.      </ClCompile>
  68.      <Link>
  69. -      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  70. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
  71.        <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
  72.      </Link>
  73.      <DriverSign>
  74. diff --git a/sys/copysup.c b/sys/copysup.c
  75. index ece3984..f24683b 100644
  76. --- a/sys/copysup.c
  77. +++ b/sys/copysup.c
  78. @@ -597,16 +597,3 @@ done_exit_filesystem:
  79.  done:
  80.      return retval;
  81.  }
  82. -
  83. -
  84. -#if defined(_ARM_) || defined(_ARM64_)
  85. -
  86. -void __security_push_cookie()
  87. -{
  88. -}
  89. -
  90. -void __security_pop_cookie()
  91. -{
  92. -}
  93. -
  94. -#endif /* defined(_ARM_) || defined(_ARM64_) */
  95. --
  96. 2.45.4
  97.  
  98. From e5d9f14711e0940acdb3225d67a344bc3e3a608b Mon Sep 17 00:00:00 2001
  99. From: Roland Mainz <roland.mainz@nrubsig.org>
  100. Date: Wed, 3 Sep 2025 11:33:08 +0200
  101. Subject: [PATCH 2/5] cygwin: Add ARM64 release build to Makefile+cleanup
  102.  
  103. Add ARM64 release build to Makefile+cleanup Makefile target names.
  104.  
  105. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  106. ---
  107. cygwin/Makefile | 33 ++++++++++++++++++++-------------
  108.  1 file changed, 20 insertions(+), 13 deletions(-)
  109.  
  110. diff --git a/cygwin/Makefile b/cygwin/Makefile
  111. index 13d0a03..de3ad27 100644
  112. --- a/cygwin/Makefile
  113. +++ b/cygwin/Makefile
  114. @@ -31,36 +31,41 @@ $(PROJECT_BASEDIR_DIR)/tests/ea/nfs_ea.exe \
  115.  #
  116.  # build the code
  117.  #
  118. -build_64bit_release:
  119. +build_x86_64bit_release:
  120.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  121.         which MSBuild.exe
  122.         MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:Build  -p:Configuration=Release -p:Platform=x64 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  123.  
  124. -build_64bit_debug:
  125. +build_x86_64bit_debug:
  126.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  127.         which MSBuild.exe
  128.         MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:Build  -p:Configuration=Debug -p:Platform=x64 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  129.  
  130. -build_32bit_release:
  131. +build_x86_32bit_release:
  132.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  133.         which MSBuild.exe
  134.         MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:Build  -p:Configuration=Release -p:Platform=x86 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  135.  
  136. -build_32bit_debug:
  137. +build_x86_32bit_debug:
  138.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  139.         which MSBuild.exe
  140.         MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:Build  -p:Configuration=Debug -p:Platform=x86 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  141.  
  142. -build_32bit_release_clientutils:
  143. +build_x86_32bit_release_clientutils:
  144.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  145.         which MSBuild.exe
  146.         MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:nfs41_np,nfs_mount  -p:Configuration=Release -p:Platform=x86 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  147.  
  148. -build_32bit_debug_clientutils:
  149. +build_x86_32bit_debug_clientutils:
  150.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  151.         which MSBuild.exe
  152.         MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:nfs41_np,nfs_mount  -p:Configuration=Debug -p:Platform=x86 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  153.  
  154. +build_arm_64bit_release:
  155. +       @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  156. +       which MSBuild.exe
  157. +       MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:Build  -p:Configuration=Release -p:Platform=ARM64 /p:CERTIFICATE_THUMBPRINT=$$CERTIFICATE_THUMBPRINT
  158. +
  159.  build_arm_64bit_debug:
  160.         @printf '#\n# PATH is %q\n#\n' '$(PATH)'
  161.         which MSBuild.exe
  162. @@ -76,14 +81,14 @@ build_testutils:
  163.         (cd "$(PROJECT_BASEDIR_DIR)/tests/winrunassystem" && make all)
  164.         (cd "$(PROJECT_BASEDIR_DIR)/tests/winsg" && make all)
  165.  
  166. -build: build_32bit_release build_32bit_debug build_64bit_release build_64bit_debug build_arm_64bit_debug build_testutils
  167. +build: build_x86_32bit_release build_x86_32bit_debug build_x86_64bit_release build_x86_64bit_debug build_arm_64bit_release build_arm_64bit_debug build_testutils
  168.         sync
  169.  
  170.  # 32bit kernel only build, for Windows <= 10/32bit
  171.  # - BUG: ARM64 build not working yet
  172.  build32: \
  173. -       build_32bit_release \
  174. -       build_32bit_debug \
  175. +       build_x86_32bit_release \
  176. +       build_x86_32bit_debug \
  177.         build_testutils
  178.         sync
  179.  
  180. @@ -93,10 +98,12 @@ build32: \
  181.  # - we need 32bit nfs41_np.dll to support 32bit applications on 64bit machines
  182.  # - BUG: ARM64 build not working yet
  183.  build64: \
  184. -       build_32bit_release_clientutils \
  185. -       build_32bit_debug_clientutils \
  186. -       build_64bit_release \
  187. -       build_64bit_debug \
  188. +       build_x86_32bit_release_clientutils \
  189. +       build_x86_32bit_debug_clientutils \
  190. +       build_x86_64bit_release \
  191. +       build_x86_64bit_debug \
  192. +       build_arm_64bit_release \
  193. +       build_arm_64bit_debug \
  194.         build_testutils
  195.         sync
  196.  
  197. --
  198. 2.45.4
  199.  
  200. From a69ec718c70cca337712067959625d053b440956 Mon Sep 17 00:00:00 2001
  201. From: Roland Mainz <roland.mainz@nrubsig.org>
  202. Date: Wed, 3 Sep 2025 13:29:45 +0200
  203. Subject: [PATCH 3/5] mount: nfs_mount -d 'N' should work (no ':' after drive
  204.  letter)+umount UNC paths does not always work
  205.  
  206. nfs_mount -d 'N' should work, without a ':' after the drive letter.
  207. This patch also fixes unmounting UNC paths, which didn't work in
  208. some cases.
  209.  
  210. Reported-by: Lionel Cons <Lionelcons1972@gmail.com>
  211. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  212. ---
  213. mount/mount.c | 106 +++++++++++++++++++++++++++++++++++++++-----------
  214.  1 file changed, 84 insertions(+), 22 deletions(-)
  215.  
  216. diff --git a/mount/mount.c b/mount/mount.c
  217. index 8afb199..e5b6df5 100644
  218. --- a/mount/mount.c
  219. +++ b/mount/mount.c
  220. @@ -217,6 +217,21 @@ void PrintUmountUsage(LPWSTR pProcess)
  221.  }
  222.  
  223.  
  224. +static
  225. +bool isvaliduncpath(const wchar_t *path)
  226. +{
  227. +    /*
  228. +     * UNC path must start with \\ and have at least the syntax \\x\...
  229. +     */
  230. +
  231. +    if ((wcsncmp(path, L"\\\\", 2) == 0) &&
  232. +        (wcslen(path) > (2+1+1)))
  233. +        return true;
  234. +    else
  235. +        return false;
  236. +}
  237. +
  238. +
  239.  static
  240.  int mount_main(int argc, wchar_t *argv[])
  241.  {
  242. @@ -430,12 +445,12 @@ opt_o_argv_i_again:
  243.              result = ERROR_INVALID_COMMAND_LINE;
  244.              goto out;
  245.         }
  246. -        /* drive letter */
  247. +        /* drive letter (2nd last argument ) */
  248.         else if ((!bUnmount) && (pLocalName == NULL) &&
  249.              (i == (argc-2)) && (wcslen(argv[i]) <= 2)) {
  250.              pLocalName = argv[i];
  251.          }
  252. -        /* remote path */
  253. +        /* remote path (last argument) */
  254.          else if ((pRemoteName == NULL) && (i == (argc-1))) {
  255.              pRemoteName = argv[i];
  256.          }
  257. @@ -448,31 +463,63 @@ opt_o_argv_i_again:
  258.          }
  259.      }
  260.  
  261. -    /* validate local drive letter */
  262. -    if (pLocalName) {
  263. -        if (!ParseDriveLetter(pLocalName, szLocalName)) {
  264. +    if (bUnmount) {
  265. +        /*
  266. +         * unmount
  267. +         */
  268. +        pLocalName = pRemoteName;
  269. +
  270. +        if (pLocalName == NULL) {
  271.              result = ERROR_BAD_ARGUMENTS;
  272. -            (void)fwprintf(stderr, L"Invalid drive letter '%ls'. "
  273. -                L"Expected 'C' or 'C:'.\n",
  274. -                pLocalName);
  275. -            goto out_free;
  276. +            (void)fwprintf(stderr, L"Drive letter or UNC path expected.\n");
  277. +            goto out;
  278. +        }
  279. +
  280. +        if (wcslen(pLocalName) <= 2) {
  281. +            if (!ParseDriveLetter(pLocalName, szLocalName)) {
  282. +                result = ERROR_BAD_ARGUMENTS;
  283. +                (void)fwprintf(stderr, L"Invalid drive letter '%ls'. "
  284. +                    L"Expected 'C' or 'C:'.\n",
  285. +                    pLocalName);
  286. +                goto out;
  287. +            }
  288. +
  289. +            result = DoUnmount(szLocalName, bForceUnmount);
  290. +        }
  291. +        else if (isvaliduncpath(pLocalName)) {
  292. +            result = DoUnmount(pLocalName, bForceUnmount);
  293. +        }
  294. +        else {
  295. +            result = ERROR_BAD_ARGUMENTS;
  296. +            (void)fwprintf(stderr,
  297. +                L"Invalid Drive or UNC path '%ls'.\n", pLocalName);
  298. +            goto out;
  299.          }
  300. -    }
  301.  
  302. -    if (bUnmount == TRUE) /* unmount */
  303. -    {
  304. -        result = DoUnmount(pLocalName?szLocalName:pRemoteName,
  305. -            bForceUnmount);
  306.          if (result)
  307.              PrintErrorMessage(result);
  308.      }
  309. -    else /* mount */
  310. -    {
  311. +    else {
  312. +        /*
  313. +         * mount
  314. +         */
  315. +
  316.          wchar_t szRemoteName[NFS41_SYS_MAX_PATH_LEN];
  317.          wchar_t szParsedRemoteName[NFS41_SYS_MAX_PATH_LEN];
  318.  
  319.          *szRemoteName = L'\0';
  320.  
  321. +        /* validate local drive letter */
  322. +        if (pLocalName) {
  323. +            if (!ParseDriveLetter(pLocalName, szLocalName)) {
  324. +                result = ERROR_BAD_ARGUMENTS;
  325. +                (void)fwprintf(stderr, L"Invalid drive letter '%ls'. "
  326. +                    L"Expected 'C' or 'C:'.\n",
  327. +                    pLocalName);
  328. +                goto out_free;
  329. +            }
  330. +        }
  331. +
  332.          if (pRemoteName == NULL)
  333.          {
  334.              result = ERROR_BAD_NET_NAME;
  335. @@ -574,19 +621,34 @@ int umount_main(int argc, wchar_t *argv[])
  336.  
  337.      if (pLocalName == NULL) {
  338.          result = ERROR_BAD_ARGUMENTS;
  339. -        (void)fwprintf(stderr, L"Drive letter expected.\n");
  340. +        (void)fwprintf(stderr, L"Drive letter or UNC path expected.\n");
  341.          goto out;
  342.      }
  343.  
  344. -    if (!ParseDriveLetter(pLocalName, szLocalName)) {
  345. +    if (wcslen(pLocalName) <= 2) {
  346. +        if (!ParseDriveLetter(pLocalName, szLocalName)) {
  347. +            result = ERROR_BAD_ARGUMENTS;
  348. +            (void)fwprintf(stderr, L"Invalid drive letter '%ls'. "
  349. +                L"Expected 'C' or 'C:'.\n",
  350. +                pLocalName);
  351. +            goto out;
  352. +        }
  353. +
  354. +        result = DoUnmount(szLocalName, bForceUnmount);
  355. +    }
  356. +    /*
  357. +     * UNC path must start with \\ and have at least the syntax \\x\...
  358. +     */
  359. +    else if (isvaliduncpath(pLocalName)) {
  360. +        result = DoUnmount(pLocalName, bForceUnmount);
  361. +    }
  362. +    else {
  363.          result = ERROR_BAD_ARGUMENTS;
  364. -        (void)fwprintf(stderr, L"Invalid drive letter '%ls'. "
  365. -            L"Expected 'C' or 'C:'.\n",
  366. -            pLocalName);
  367. +        (void)fwprintf(stderr,
  368. +            L"Invalid Drive or UNC path '%ls'.\n", pLocalName);
  369.          goto out;
  370.      }
  371.  
  372. -    result = DoUnmount(szLocalName, bForceUnmount);
  373.      if (result)
  374.          PrintErrorMessage(result);
  375.  out:
  376. --
  377. 2.45.4
  378.  
  379. From a853268800e95b2b9c35a3ee4ce37b9d95de9da3 Mon Sep 17 00:00:00 2001
  380. From: Roland Mainz <roland.mainz@nrubsig.org>
  381. Date: Wed, 3 Sep 2025 14:57:19 +0200
  382. Subject: [PATCH 4/5] build.vc19,libtirpc: Use |_WINTIRPC| instead of |_WIN32|
  383.  for project #if/#else to avoid collision with Cygwin/MSYS2 libtirpc
  384.  
  385. Use |_WINTIRPC| instead of |_WIN32| for project #if/#else to avoid
  386. collision with Cygwin/MSYS2 libtirpc.
  387.  
  388. Reported-by: Cedric Blancher <cedric.blancher@gmail.com>
  389. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  390. ---
  391. build.vc19/libtirpc/libtirpc.vcxproj | 12 ++++----
  392.  build.vc19/nfsd/nfsd.vcxproj         | 12 ++++----
  393.  libtirpc/src/asprintf.c              |  4 +--
  394.  libtirpc/src/auth_des.c              | 24 +++++++--------
  395.  libtirpc/src/auth_gss.c              |  4 +--
  396.  libtirpc/src/auth_none.c             |  4 +--
  397.  libtirpc/src/auth_sspi.c             |  4 +--
  398.  libtirpc/src/auth_time.c             | 26 ++++++++--------
  399.  libtirpc/src/auth_unix.c             | 20 ++++++-------
  400.  libtirpc/src/authdes_prot.c          |  4 +--
  401.  libtirpc/src/authsspi_prot.c         |  4 +--
  402.  libtirpc/src/authunix_prot.c         |  4 +--
  403.  libtirpc/src/bindresvport.c          | 18 ++++++------
  404.  libtirpc/src/clnt_bcast.c            | 30 +++++++++----------
  405.  libtirpc/src/clnt_dg.c               | 38 ++++++++++++------------
  406.  libtirpc/src/clnt_generic.c          | 22 +++++++-------
  407.  libtirpc/src/clnt_raw.c              |  8 ++---
  408.  libtirpc/src/clnt_simple.c           | 16 +++++-----
  409.  libtirpc/src/clnt_vc.c               | 44 ++++++++++++++--------------
  410.  libtirpc/src/crypt_client.c          |  8 ++---
  411.  libtirpc/src/des_crypt.c             |  4 +--
  412.  libtirpc/src/des_soft.c              |  4 +--
  413.  libtirpc/src/epoll_sub.c             |  2 +-
  414.  libtirpc/src/getnetconfig.c          | 12 ++++----
  415.  libtirpc/src/getnetpath.c            | 12 ++++----
  416.  libtirpc/src/getpeereid.c            | 14 ++++-----
  417.  libtirpc/src/getpublickey.c          |  8 ++---
  418.  libtirpc/src/getrpcent.c             |  8 ++---
  419.  libtirpc/src/getrpcport.c            |  8 ++---
  420.  libtirpc/src/key_call.c              |  6 ++--
  421.  libtirpc/src/key_prot_xdr.c          |  4 +--
  422.  libtirpc/src/mt_misc.c               | 10 +++----
  423.  libtirpc/src/netname.c               | 12 ++++----
  424.  libtirpc/src/netnamer.c              |  4 +--
  425.  libtirpc/src/pmap_clnt.c             | 12 ++++----
  426.  libtirpc/src/pmap_getmaps.c          | 20 ++++++-------
  427.  libtirpc/src/pmap_getport.c          | 12 ++++----
  428.  libtirpc/src/pmap_rmt.c              | 16 +++++-----
  429.  libtirpc/src/rpc_callmsg.c           |  4 +--
  430.  libtirpc/src/rpc_com.h               |  6 ++--
  431.  libtirpc/src/rpc_dtablesize.c        |  6 ++--
  432.  libtirpc/src/rpc_generic.c           | 28 +++++++++---------
  433.  libtirpc/src/rpc_prot.c              |  4 +--
  434.  libtirpc/src/rpc_soc.c               | 22 +++++++-------
  435.  libtirpc/src/rpcb_clnt.c             | 18 ++++++------
  436.  libtirpc/src/rpcb_st_xdr.c           |  4 +--
  437.  libtirpc/src/rpcdname.c              | 12 ++++----
  438.  libtirpc/src/rtime.c                 | 16 +++++-----
  439.  libtirpc/src/svc.c                   | 14 ++++-----
  440.  libtirpc/src/svc_auth.c              |  4 +--
  441.  libtirpc/src/svc_auth_des.c          | 12 ++++----
  442.  libtirpc/src/svc_auth_unix.c         |  4 +--
  443.  libtirpc/src/svc_dg.c                | 20 ++++++-------
  444.  libtirpc/src/svc_generic.c           | 12 ++++----
  445.  libtirpc/src/svc_raw.c               |  4 +--
  446.  libtirpc/src/svc_run.c               | 16 +++++-----
  447.  libtirpc/src/svc_simple.c            | 12 ++++----
  448.  libtirpc/src/svc_vc.c                | 40 ++++++++++++-------------
  449.  libtirpc/src/xdr.c                   | 12 ++++----
  450.  libtirpc/src/xdr_array.c             |  8 ++---
  451.  libtirpc/src/xdr_float.c             |  8 ++---
  452.  libtirpc/src/xdr_mem.c               |  8 ++---
  453.  libtirpc/src/xdr_rec.c               | 16 +++++-----
  454.  libtirpc/src/xdr_reference.c         |  8 ++---
  455.  libtirpc/src/xdr_sizeof.c            |  4 +--
  456.  libtirpc/src/xdr_stdio.c             |  8 ++---
  457.  libtirpc/tirpc/misc/event.h          |  4 +--
  458.  libtirpc/tirpc/netconfig.h           |  4 +--
  459.  libtirpc/tirpc/reentrant.h           |  4 +--
  460.  libtirpc/tirpc/rpc/auth.h            |  4 +--
  461.  libtirpc/tirpc/rpc/auth_des.h        |  2 +-
  462.  libtirpc/tirpc/rpc/auth_sspi.h       |  4 ++-
  463.  libtirpc/tirpc/rpc/auth_unix.h       |  4 +--
  464.  libtirpc/tirpc/rpc/clnt.h            |  8 ++---
  465.  libtirpc/tirpc/rpc/clnt_soc.h        |  4 +--
  466.  libtirpc/tirpc/rpc/des_crypt.h       |  4 +--
  467.  libtirpc/tirpc/rpc/pmap_clnt.h       |  4 +--
  468.  libtirpc/tirpc/rpc/pmap_prot.h       |  4 +--
  469.  libtirpc/tirpc/rpc/pmap_rmt.h        |  4 +--
  470.  libtirpc/tirpc/rpc/rpc.h             |  4 +--
  471.  libtirpc/tirpc/rpc/rpc_com.h         |  6 ++--
  472.  libtirpc/tirpc/rpc/svc.h             |  4 +--
  473.  libtirpc/tirpc/rpc/svc_soc.h         |  4 +--
  474.  libtirpc/tirpc/rpc/types.h           | 12 ++++----
  475.  libtirpc/tirpc/rpc/xdr.h             |  8 ++---
  476.  libtirpc/tirpc/spinlock.h            |  4 +--
  477.  libtirpc/tirpc/wintirpc.h            |  7 ++++-
  478.  87 files changed, 457 insertions(+), 450 deletions(-)
  479.  
  480. diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj
  481. index 44d1364..815629f 100644
  482. --- a/build.vc19/libtirpc/libtirpc.vcxproj
  483. +++ b/build.vc19/libtirpc/libtirpc.vcxproj
  484. @@ -126,7 +126,7 @@
  485.        </PrecompiledHeader>
  486.        <WarningLevel>Level4</WarningLevel>
  487.        <Optimization>Disabled</Optimization>
  488. -      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  489. +      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  490.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  491.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  492.        <StringPooling>true</StringPooling>
  493. @@ -152,7 +152,7 @@
  494.        </PrecompiledHeader>
  495.        <WarningLevel>Level4</WarningLevel>
  496.        <Optimization>Disabled</Optimization>
  497. -      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  498. +      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  499.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  500.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  501.        <StringPooling>true</StringPooling>
  502. @@ -178,7 +178,7 @@
  503.        </PrecompiledHeader>
  504.        <WarningLevel>Level4</WarningLevel>
  505.        <Optimization>Disabled</Optimization>
  506. -      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  507. +      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  508.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  509.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  510.        <StringPooling>true</StringPooling>
  511. @@ -204,7 +204,7 @@
  512.        </PrecompiledHeader>
  513.        <Optimization>MaxSpeed</Optimization>
  514.        <FunctionLevelLinking>true</FunctionLevelLinking>
  515. -      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  516. +      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  517.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  518.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  519.        <StringPooling>true</StringPooling>
  520. @@ -234,7 +234,7 @@
  521.        </PrecompiledHeader>
  522.        <Optimization>MaxSpeed</Optimization>
  523.        <FunctionLevelLinking>true</FunctionLevelLinking>
  524. -      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  525. +      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  526.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  527.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  528.        <StringPooling>true</StringPooling>
  529. @@ -264,7 +264,7 @@
  530.        </PrecompiledHeader>
  531.        <Optimization>MaxSpeed</Optimization>
  532.        <IntrinsicFunctions>true</IntrinsicFunctions>
  533. -      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  534. +      <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  535.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  536.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  537.        <StringPooling>true</StringPooling>
  538. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  539. index c22efd1..22e4f8b 100644
  540. --- a/build.vc19/nfsd/nfsd.vcxproj
  541. +++ b/build.vc19/nfsd/nfsd.vcxproj
  542. @@ -132,7 +132,7 @@
  543.        </PrecompiledHeader>
  544.        <WarningLevel>Level4</WarningLevel>
  545.        <Optimization>Disabled</Optimization>
  546. -      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  547. +      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  548.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  549.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  550.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  551. @@ -157,7 +157,7 @@
  552.        </PrecompiledHeader>
  553.        <WarningLevel>Level4</WarningLevel>
  554.        <Optimization>Disabled</Optimization>
  555. -      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  556. +      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  557.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  558.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  559.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  560. @@ -183,7 +183,7 @@
  561.        </PrecompiledHeader>
  562.        <WarningLevel>Level4</WarningLevel>
  563.        <Optimization>Disabled</Optimization>
  564. -      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  565. +      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  566.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  567.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  568.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  569. @@ -210,7 +210,7 @@
  570.        <Optimization>MaxSpeed</Optimization>
  571.        <FunctionLevelLinking>true</FunctionLevelLinking>
  572.        <IntrinsicFunctions>true</IntrinsicFunctions>
  573. -      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  574. +      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  575.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  576.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  577.        <BufferSecurityCheck>false</BufferSecurityCheck>
  578. @@ -238,7 +238,7 @@
  579.        <Optimization>MaxSpeed</Optimization>
  580.        <FunctionLevelLinking>true</FunctionLevelLinking>
  581.        <IntrinsicFunctions>true</IntrinsicFunctions>
  582. -      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  583. +      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  584.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  585.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  586.        <BufferSecurityCheck>false</BufferSecurityCheck>
  587. @@ -267,7 +267,7 @@
  588.        <Optimization>MaxSpeed</Optimization>
  589.        <FunctionLevelLinking>true</FunctionLevelLinking>
  590.        <IntrinsicFunctions>true</IntrinsicFunctions>
  591. -      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  592. +      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_WINTIRPC;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  593.        <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  594.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  595.        <BufferSecurityCheck>false</BufferSecurityCheck>
  596. diff --git a/libtirpc/src/asprintf.c b/libtirpc/src/asprintf.c
  597. index 8f47011..2b17afa 100644
  598. --- a/libtirpc/src/asprintf.c
  599. +++ b/libtirpc/src/asprintf.c
  600. @@ -16,13 +16,13 @@
  601.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  602.   */
  603.  
  604. -#ifdef _WIN32
  605. +#ifdef _WINTIRPC
  606.  #include <wintirpc.h>
  607.  #include <stdarg.h>
  608.  #else
  609.  extern int vsnprintf();
  610.  #include <varargs.h>
  611. -#endif /* _WIN32 */
  612. +#endif /* _WINTIRPC */
  613.  #include <stdio.h>
  614.  
  615.  /* Include vasprintf() if not on your OS. */
  616. diff --git a/libtirpc/src/auth_des.c b/libtirpc/src/auth_des.c
  617. index 41357c7..71de847 100644
  618. --- a/libtirpc/src/auth_des.c
  619. +++ b/libtirpc/src/auth_des.c
  620. @@ -33,40 +33,40 @@
  621.   */
  622.  
  623.  #include <wintirpc.h>
  624. -#ifndef _WIN32
  625. +#ifndef _WINTIRPC
  626.  #include <pthread.h>
  627. -#endif /* !_WIN32 */
  628. +#endif /* !_WINTIRPC */
  629.  #include <reentrant.h>
  630. -#ifndef _WIN32
  631. +#ifndef _WINTIRPC
  632.  #include <err.h>
  633. -#endif /* !_WIN32 */
  634. +#endif /* !_WINTIRPC */
  635.  #include <errno.h>
  636.  #include <string.h>
  637.  #include <stdlib.h>
  638. -#ifndef _WIN32
  639. +#ifndef _WINTIRPC
  640.  #include <unistd.h>
  641.  #include <sys/cdefs.h>
  642. -#endif /* !_WIN32 */
  643. +#endif /* !_WINTIRPC */
  644.  #include <rpc/des_crypt.h>
  645. -#ifndef _WIN32
  646. +#ifndef _WINTIRPC
  647.  #include <syslog.h>
  648. -#endif /* !_WIN32 */
  649. +#endif /* !_WINTIRPC */
  650.  #include <rpc/types.h>
  651.  #include <rpc/auth.h>
  652.  #include <rpc/auth_des.h>
  653.  #include <rpc/clnt.h>
  654.  #include <rpc/xdr.h>
  655. -#ifndef _WIN32
  656. +#ifndef _WINTIRPC
  657.  #include <sys/socket.h>
  658. -#endif /* !_WIN32 */
  659. +#endif /* !_WINTIRPC */
  660.  #undef NIS
  661.  #include <rpcsvc/nis.h>
  662.  
  663.  #if defined(LIBC_SCCS) && !defined(lint)
  664.  #endif
  665. -#ifndef _WIN32
  666. +#ifndef _WINTIRPC
  667.  #include <sys/cdefs.h>
  668. -#endif /* !_WIN32 */
  669. +#endif /* !_WINTIRPC */
  670.  
  671.  #define USEC_PER_SEC           1000000
  672.  #define RTIME_TIMEOUT          5       /* seconds to wait for sync */
  673. diff --git a/libtirpc/src/auth_gss.c b/libtirpc/src/auth_gss.c
  674. index c7ea358..2975d80 100644
  675. --- a/libtirpc/src/auth_gss.c
  676. +++ b/libtirpc/src/auth_gss.c
  677. @@ -38,9 +38,9 @@
  678.  
  679.  #include <stdio.h>
  680.  #include <stdlib.h>
  681. -#ifndef _WIN32
  682. +#ifndef _WINTIRPC
  683.  #include <unistd.h>
  684. -#endif /* !_WIN32 */
  685. +#endif /* !_WINTIRPC */
  686.  #include <string.h>
  687.  #include <errno.h>
  688.  #include <rpc/types.h>
  689. diff --git a/libtirpc/src/auth_none.c b/libtirpc/src/auth_none.c
  690. index a8ba973..deaec18 100644
  691. --- a/libtirpc/src/auth_none.c
  692. +++ b/libtirpc/src/auth_none.c
  693. @@ -66,9 +66,9 @@ __FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.12 2002/03/22 23:18:35 obri
  694.   */
  695.  
  696.  #include <wintirpc.h>
  697. -#ifndef _WIN32
  698. +#ifndef _WINTIRPC
  699.  #include <pthread.h>
  700. -#endif /* !_WIN32 */
  701. +#endif /* !_WINTIRPC */
  702.  #include <reentrant.h>
  703.  #include <assert.h>
  704.  #include <stdlib.h>
  705. diff --git a/libtirpc/src/auth_sspi.c b/libtirpc/src/auth_sspi.c
  706. index 1cc69f0..4e82183 100644
  707. --- a/libtirpc/src/auth_sspi.c
  708. +++ b/libtirpc/src/auth_sspi.c
  709. @@ -22,9 +22,9 @@
  710.  #include <wintirpc.h>
  711.  #include <stdio.h>
  712.  #include <stdlib.h>
  713. -#ifndef _WIN32
  714. +#ifndef _WINTIRPC
  715.  #include <unistd.h>
  716. -#endif /* !_WIN32 */
  717. +#endif /* !_WINTIRPC */
  718.  #include <string.h>
  719.  #include <errno.h>
  720.  #include <rpc/types.h>
  721. diff --git a/libtirpc/src/auth_time.c b/libtirpc/src/auth_time.c
  722. index 43ef5fc..55fde7c 100644
  723. --- a/libtirpc/src/auth_time.c
  724. +++ b/libtirpc/src/auth_time.c
  725. @@ -25,34 +25,34 @@
  726.   *     needed to deal with TCP connections.
  727.   */
  728.  
  729. -#ifndef _WIN32
  730. +#ifndef _WINTIRPC
  731.  #include <sys/cdefs.h>
  732. -#endif /* !_WIN32 */
  733. +#endif /* !_WINTIRPC */
  734.  #include <wintirpc.h>
  735. -#ifndef _WIN32
  736. +#ifndef _WINTIRPC
  737.  #include <syslog.h>
  738.  #endif
  739.  #include <string.h>
  740.  #include <stdlib.h>
  741. -#ifndef _WIN32
  742. +#ifndef _WINTIRPC
  743.  #include <unistd.h>
  744.  #include <netdb.h>
  745.  #include <sys/signal.h>
  746. -#endif /* !_WIN32 */
  747. +#endif /* !_WINTIRPC */
  748.  #include <errno.h>
  749. -#ifndef _WIN32
  750. +#ifndef _WINTIRPC
  751.  #include <sys/socket.h>
  752.  #include <netinet/in.h>
  753.  #include <arpa/inet.h>
  754. -#endif /* !_WIN32 */
  755. +#endif /* !_WINTIRPC */
  756.  
  757.  #include <rpc/rpc.h>
  758.  #include <rpc/rpc_com.h>
  759.  #include <rpc/rpcb_prot.h>
  760. -#ifndef _WIN32
  761. +#ifndef _WINTIRPC
  762.  #include <clnt_soc.h>
  763.  #include <sys/select.h>
  764. -#endif /* !_WIN32 */
  765. +#endif /* !_WINTIRPC */
  766.  #undef NIS
  767.  #include <rpcsvc/nis.h>
  768.  
  769. @@ -253,7 +253,7 @@ __rpc_get_time_offset(
  770.         char                    ut[64], ipuaddr[64];
  771.         endpoint                teps[32];
  772.         nis_server              tsrv = { 0 };
  773. -#ifndef _WIN32
  774. +#ifndef _WINTIRPC
  775.         void                    (*oldsig)(int) = NULL; /* old alarm handler */
  776.  #endif
  777.         struct sockaddr_in      sin;
  778. @@ -423,7 +423,7 @@ __rpc_get_time_offset(
  779.                         time_valid = 1;
  780.                 } else {
  781.                         int res;
  782. -#ifndef _WIN32
  783. +#ifndef _WINTIRPC
  784.                         oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler);
  785.                         saw_alarm = 0; /* global tracking the alarm */
  786.                         alarm(20); /* only wait 20 seconds */
  787. @@ -440,7 +440,7 @@ __rpc_get_time_offset(
  788.                                 msg("alarm caught it, must be unreachable.");
  789.                                 goto error;
  790.                         }
  791. -#ifndef _WIN32
  792. +#ifndef _WINTIRPC
  793.                         res = read(s, (char *)&thetime, sizeof(thetime));
  794.  #else
  795.                         res = (int)wintirpc_recv(s, (char *)&thetime, sizeof(thetime), 0);
  796. @@ -480,7 +480,7 @@ error:
  797.         if (clnt != NULL)
  798.                 clnt_destroy(clnt);
  799.  
  800. -#ifdef _WIN32
  801. +#ifdef _WINTIRPC
  802.         /* XXX Need Windows signal/alarm stuff here XXX */
  803.  #else
  804.         alarm(0);       /* reset that alarm if its outstanding */
  805. diff --git a/libtirpc/src/auth_unix.c b/libtirpc/src/auth_unix.c
  806. index 201c6b5..087d9b8 100644
  807. --- a/libtirpc/src/auth_unix.c
  808. +++ b/libtirpc/src/auth_unix.c
  809. @@ -26,9 +26,9 @@
  810.   * POSSIBILITY OF SUCH DAMAGE.
  811.   */
  812.  
  813. -#ifndef _WIN32
  814. +#ifndef _WINTIRPC
  815.  #include <sys/cdefs.h>
  816. -#endif /* !_WIN32 */
  817. +#endif /* !_WINTIRPC */
  818.  
  819.  /*
  820.   * auth_unix.c, Implements UNIX style authentication parameters.
  821. @@ -66,23 +66,23 @@
  822.   */
  823.  
  824.  #include <wintirpc.h>
  825. -#ifndef _WIN32
  826. +#ifndef _WINTIRPC
  827.  #include <pthread.h>
  828. -#endif /* !_WIN32 */
  829. +#endif /* !_WINTIRPC */
  830.  #include <reentrant.h>
  831. -#ifndef _WIN32
  832. +#ifndef _WINTIRPC
  833.  #include <sys/param.h>
  834. -#endif /* !_WIN32 */
  835. +#endif /* !_WINTIRPC */
  836.  
  837. -#ifndef _WIN32
  838. +#ifndef _WINTIRPC
  839.  #include <assert.h>
  840.  #include <err.h>
  841. -#endif /* !_WIN32 */
  842. +#endif /* !_WINTIRPC */
  843.  #include <stdio.h>
  844.  #include <stdlib.h>
  845. -#ifndef _WIN32
  846. +#ifndef _WINTIRPC
  847.  #include <unistd.h>
  848. -#endif /* !_WIN32 */
  849. +#endif /* !_WINTIRPC */
  850.  #include <string.h>
  851.  
  852.  #include <rpc/types.h>
  853. diff --git a/libtirpc/src/authdes_prot.c b/libtirpc/src/authdes_prot.c
  854. index 064c31f..e3d17e2 100644
  855. --- a/libtirpc/src/authdes_prot.c
  856. +++ b/libtirpc/src/authdes_prot.c
  857. @@ -1,6 +1,6 @@
  858. -#ifndef _WIN32
  859. +#ifndef _WINTIRPC
  860.  #include <sys/cdefs.h>
  861. -#endif /* !_WIN32 */
  862. +#endif /* !_WINTIRPC */
  863.  /*
  864.   * Copyright (c) 2009, Sun Microsystems, Inc.
  865.   * All rights reserved.
  866. diff --git a/libtirpc/src/authsspi_prot.c b/libtirpc/src/authsspi_prot.c
  867. index 4dc0d35..d46d09f 100644
  868. --- a/libtirpc/src/authsspi_prot.c
  869. +++ b/libtirpc/src/authsspi_prot.c
  870. @@ -25,9 +25,9 @@
  871.  #include <stdio.h>
  872.  #include <stdlib.h>
  873.  #include <stdarg.h>
  874. -#ifndef _WIN32
  875. +#ifndef _WINTIRPC
  876.  #include <rpc/types.h>
  877. -#endif /* !_WIN32 */
  878. +#endif /* !_WINTIRPC */
  879.  #include <rpc/xdr.h>
  880.  #include <rpc/auth.h>
  881.  #include <rpc/auth_sspi.h>
  882. diff --git a/libtirpc/src/authunix_prot.c b/libtirpc/src/authunix_prot.c
  883. index 181c1f3..e42e3a0 100644
  884. --- a/libtirpc/src/authunix_prot.c
  885. +++ b/libtirpc/src/authunix_prot.c
  886. @@ -26,9 +26,9 @@
  887.   * POSSIBILITY OF SUCH DAMAGE.
  888.   */
  889.  
  890. -#ifndef _WIN32
  891. +#ifndef _WINTIRPC
  892.  #include <sys/cdefs.h>
  893. -#endif /* !_WIN32 */
  894. +#endif /* !_WINTIRPC */
  895.  
  896.  /*
  897.   * authunix_prot.c
  898. diff --git a/libtirpc/src/bindresvport.c b/libtirpc/src/bindresvport.c
  899. index 1f76ddc..6841a89 100644
  900. --- a/libtirpc/src/bindresvport.c
  901. +++ b/libtirpc/src/bindresvport.c
  902. @@ -27,9 +27,9 @@
  903.   * POSSIBILITY OF SUCH DAMAGE.
  904.   */
  905.  
  906. -#ifndef _WIN32
  907. +#ifndef _WINTIRPC
  908.  #include <sys/cdefs.h>
  909. -#endif /* !_WIN32 */
  910. +#endif /* !_WINTIRPC */
  911.  
  912.  /*
  913.   * Copyright (c) 1987 by Sun Microsystems, Inc.
  914. @@ -40,24 +40,24 @@
  915.  
  916.  #include <wintirpc.h>
  917.  #include <sys/types.h>
  918. -#ifndef _WIN32
  919. +#ifndef _WINTIRPC
  920.  #include <sys/socket.h>
  921.  #include <netinet/in.h>
  922. -#endif /* !_WIN32 */
  923. +#endif /* !_WINTIRPC */
  924.  
  925.  #include <errno.h>
  926.  #include <string.h>
  927. -#ifndef _WIN32
  928. +#ifndef _WINTIRPC
  929.  #include <unistd.h>
  930. -#endif /* !_WIN32 */
  931. +#endif /* !_WINTIRPC */
  932.  
  933.  #include <rpc/rpc.h>
  934.  
  935. -#ifdef _WIN32
  936. +#ifdef _WINTIRPC
  937.  #include <winsock2.h>
  938.  #include <mstcpip.h>
  939.  #include <ws2ipdef.h>
  940. -#endif /* _WIN32 */
  941. +#endif /* _WINTIRPC */
  942.  
  943.  /*
  944.   * Bind a socket to a privileged IP port
  945. @@ -150,7 +150,7 @@ bindresvport_sa(int sd, struct sockaddr *sa)
  946.          return (res);
  947.  }
  948.  
  949. -#elif defined(_WIN32)
  950. +#elif defined(_WINTIRPC)
  951.  
  952.  #define STARTPORT 600
  953.  #define ENDPORT (IPPORT_RESERVED - 1)
  954. diff --git a/libtirpc/src/clnt_bcast.c b/libtirpc/src/clnt_bcast.c
  955. index a69367a..2154e81 100644
  956. --- a/libtirpc/src/clnt_bcast.c
  957. +++ b/libtirpc/src/clnt_bcast.c
  958. @@ -28,9 +28,9 @@
  959.  /*
  960.   * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  961.   */
  962. -#ifndef _WIN32
  963. +#ifndef _WINTIRPC
  964.  #include <sys/cdefs.h>
  965. -#endif /* !_WIN32 */
  966. +#endif /* !_WINTIRPC */
  967.  
  968.  /*
  969.   * clnt_bcast.c
  970. @@ -43,25 +43,25 @@
  971.   */
  972.  
  973.  #include <wintirpc.h>
  974. -#ifndef _WIN32
  975. +#ifndef _WINTIRPC
  976.  #include <sys/socket.h>
  977. -#endif /* !_WIN32 */
  978. +#endif /* !_WINTIRPC */
  979.  #include <sys/types.h>
  980. -#ifndef _WIN32
  981. +#ifndef _WINTIRPC
  982.  #include <sys/queue.h>
  983. -#endif /* !_WIN32 */
  984. +#endif /* !_WINTIRPC */
  985.  
  986.  /* new queue functions */
  987. -#ifndef _WIN32
  988. +#ifndef _WINTIRPC
  989.  #include <misc/queue.h>
  990. -#endif /* !_WIN32 */
  991. +#endif /* !_WINTIRPC */
  992.  
  993. -#ifndef _WIN32
  994. +#ifndef _WINTIRPC
  995.  #include <net/if.h>
  996.  #include <netinet/in.h>
  997.  #include <ifaddrs.h>
  998.  #include <sys/poll.h>
  999. -#endif /* !_WIN32 */
  1000. +#endif /* !_WINTIRPC */
  1001.  #include <rpc/rpc.h>
  1002.  #ifdef PORTMAP
  1003.  #include <rpc/pmap_prot.h>
  1004. @@ -69,20 +69,20 @@
  1005.  #include <rpc/pmap_rmt.h>
  1006.  #endif                         /* PORTMAP */
  1007.  #include <rpc/nettype.h>
  1008. -#ifndef _WIN32
  1009. +#ifndef _WINTIRPC
  1010.  #include <arpa/inet.h>
  1011.  #define RPC_DEBUG 1
  1012. -#endif /* !_WIN32 */
  1013. +#endif /* !_WINTIRPC */
  1014.  #ifdef RPC_DEBUG
  1015.  #include <stdio.h>
  1016.  #endif
  1017.  #include <errno.h>
  1018.  #include <stdlib.h>
  1019. -#ifndef _WIN32
  1020. +#ifndef _WINTIRPC
  1021.  #include <unistd.h>
  1022.  #include <netdb.h>
  1023.  #include <err.h>
  1024. -#endif /* !_WIN32 */
  1025. +#endif /* !_WINTIRPC */
  1026.  #include <string.h>
  1027.  
  1028.  #include "rpc_com.h"
  1029. @@ -102,7 +102,7 @@
  1030.   * For now, ASSUME that we do not need this for the Windows port!!!!
  1031.   */
  1032.  #include <wintirpc.h>
  1033. -#ifdef _WIN32
  1034. +#ifdef _WINTIRPC
  1035.  int __rpc_lowvers = 0;
  1036.  
  1037.  enum clnt_stat
  1038. diff --git a/libtirpc/src/clnt_dg.c b/libtirpc/src/clnt_dg.c
  1039. index 0ba11e8..427ecd5 100644
  1040. --- a/libtirpc/src/clnt_dg.c
  1041. +++ b/libtirpc/src/clnt_dg.c
  1042. @@ -33,12 +33,12 @@
  1043.   * Implements a connectionless client side RPC.
  1044.   */
  1045.  #include <wintirpc.h>
  1046. -#ifndef _WIN32
  1047. +#ifndef _WINTIRPC
  1048.  #include <pthread.h>
  1049. -#endif /* !_WIN32 */
  1050. +#endif /* !_WINTIRPC */
  1051.  #include <reentrant.h>
  1052.  #include <sys/types.h>
  1053. -#ifndef _WIN32
  1054. +#ifndef _WINTIRPC
  1055.  #include <sys/socket.h>
  1056.  #include <stdint.h>
  1057.  #include <sys/poll.h>
  1058. @@ -46,24 +46,24 @@
  1059.  #include <sys/time.h>
  1060.  
  1061.  #include <sys/ioctl.h>
  1062. -#endif /* !_WIN32 */
  1063. +#endif /* !_WINTIRPC */
  1064.  #include <rpc/clnt.h>
  1065. -#ifndef _WIN32
  1066. +#ifndef _WINTIRPC
  1067.  #include <arpa/inet.h>
  1068. -#endif /* !_WIN32 */
  1069. +#endif /* !_WINTIRPC */
  1070.  #include <rpc/rpc.h>
  1071.  #include <rpc/xdr.h>
  1072.  #include <errno.h>
  1073.  #include <stdlib.h>
  1074.  #include <string.h>
  1075. -#ifndef _WIN32
  1076. +#ifndef _WINTIRPC
  1077.  #include <signal.h>
  1078.  #include <unistd.h>
  1079.  #include <err.h>
  1080. -#endif /* !_WIN32 */
  1081. +#endif /* !_WINTIRPC */
  1082.  #include "rpc_com.h"
  1083.  
  1084. -#ifdef _WIN32
  1085. +#ifdef _WINTIRPC
  1086.  #undef IP_RECVERR
  1087.  #endif
  1088.  
  1089. @@ -103,7 +103,7 @@ static void clnt_dg_destroy(CLIENT *);
  1090.  static int     *dg_fd_locks;
  1091.  extern mutex_t clnt_fd_lock;
  1092.  static cond_t  *dg_cv;
  1093. -#ifndef _WIN32
  1094. +#ifndef _WINTIRPC
  1095.  #define        release_fd_lock(fd, mask) {             \
  1096.         mutex_lock(&clnt_fd_lock);      \
  1097.         dg_fd_locks[(fd)] = 0;          \
  1098. @@ -175,7 +175,7 @@ clnt_dg_create(
  1099.         struct cu_data *cu = NULL;      /* private data */
  1100.         struct timeval now;
  1101.         struct rpc_msg call_msg;
  1102. -#ifndef _WIN32
  1103. +#ifndef _WINTIRPC
  1104.         sigset_t mask;
  1105.         sigset_t newmask;
  1106.  #else
  1107. @@ -184,7 +184,7 @@ clnt_dg_create(
  1108.         struct __rpc_sockinfo si;
  1109.         u_long one = 1;
  1110.  
  1111. -#ifndef _WIN32
  1112. +#ifndef _WINTIRPC
  1113.         sigfillset(&newmask);
  1114.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1115.  #else
  1116. @@ -341,7 +341,7 @@ clnt_dg_call(
  1117.         struct pollfd fd;
  1118.         int total_time, nextsend_time, tv=0;
  1119.         struct sockaddr *sa;
  1120. -#ifndef _WIN32
  1121. +#ifndef _WINTIRPC
  1122.         sigset_t mask;
  1123.         sigset_t newmask;
  1124.  #else
  1125. @@ -353,7 +353,7 @@ clnt_dg_call(
  1126.         u_int32_t xid, inval, outval;
  1127.  
  1128.         outlen = 0;
  1129. -#ifndef _WIN32
  1130. +#ifndef _WINTIRPC
  1131.         sigfillset(&newmask);
  1132.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1133.  #else
  1134. @@ -602,7 +602,7 @@ clnt_dg_freeres(
  1135.         struct cu_data *cu = (struct cu_data *)cl->cl_private;
  1136.         XDR *xdrs = &(cu->cu_outxdrs);
  1137.         bool_t dummy;
  1138. -#ifndef _WIN32
  1139. +#ifndef _WINTIRPC
  1140.         sigset_t mask;
  1141.         sigset_t newmask;
  1142.  
  1143. @@ -636,7 +636,7 @@ clnt_dg_control(
  1144.  {
  1145.         struct cu_data *cu = (struct cu_data *)cl->cl_private;
  1146.         struct netbuf *addr;
  1147. -#ifndef _WIN32
  1148. +#ifndef _WINTIRPC
  1149.         sigset_t mask;
  1150.         sigset_t newmask;
  1151.  #else
  1152. @@ -644,7 +644,7 @@ clnt_dg_control(
  1153.  #endif
  1154.         int rpc_lock_value;
  1155.  
  1156. -#ifndef _WIN32
  1157. +#ifndef _WINTIRPC
  1158.         sigfillset(&newmask);
  1159.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1160.  #else
  1161. @@ -784,7 +784,7 @@ clnt_dg_destroy(CLIENT *cl)
  1162.  {
  1163.         struct cu_data *cu = (struct cu_data *)cl->cl_private;
  1164.         int cu_fd = cu->cu_fd;
  1165. -#ifndef _WIN32
  1166. +#ifndef _WINTIRPC
  1167.         sigset_t mask;
  1168.         sigset_t newmask;
  1169.  
  1170. @@ -815,7 +815,7 @@ clnt_dg_ops()
  1171.  {
  1172.         static struct clnt_ops ops;
  1173.         extern mutex_t  ops_lock;
  1174. -#ifndef _WIN32
  1175. +#ifndef _WINTIRPC
  1176.         sigset_t mask;
  1177.         sigset_t newmask;
  1178.  
  1179. diff --git a/libtirpc/src/clnt_generic.c b/libtirpc/src/clnt_generic.c
  1180. index 0e582ab..3de0e74 100644
  1181. --- a/libtirpc/src/clnt_generic.c
  1182. +++ b/libtirpc/src/clnt_generic.c
  1183. @@ -53,35 +53,35 @@
  1184.   */
  1185.  
  1186.  #include <wintirpc.h>
  1187. -#ifndef _WIN32
  1188. +#ifndef _WINTIRPC
  1189.  #include <pthread.h>
  1190. -#endif /* !_WIN32 */
  1191. +#endif /* !_WINTIRPC */
  1192.  #include <reentrant.h>
  1193.  #include <sys/types.h>
  1194. -#ifndef _WIN32
  1195. +#ifndef _WINTIRPC
  1196.  #include <sys/fcntl.h>
  1197. -#endif /* !_WIN32 */
  1198. +#endif /* !_WINTIRPC */
  1199.  #include <fcntl.h>
  1200. -#ifndef _WIN32
  1201. +#ifndef _WINTIRPC
  1202.  #include <sys/socket.h>
  1203.  #include <netinet/in.h>
  1204.  #include <netinet/tcp.h>
  1205. -#endif /* !_WIN32 */
  1206. +#endif /* !_WINTIRPC */
  1207.  #include <stdio.h>
  1208.  #include <errno.h>
  1209.  #include <string.h>
  1210.  #include <stdlib.h>
  1211. -#ifndef _WIN32
  1212. +#ifndef _WINTIRPC
  1213.  #include <netdb.h>
  1214. -#endif /* !_WIN32 */
  1215. -#ifndef _WIN32
  1216. +#endif /* !_WINTIRPC */
  1217. +#ifndef _WINTIRPC
  1218.  #include <syslog.h>
  1219.  #endif
  1220.  #include <rpc/rpc.h>
  1221.  #include <rpc/nettype.h>
  1222. -#ifndef _WIN32
  1223. +#ifndef _WINTIRPC
  1224.  #include <unistd.h>
  1225. -#endif /* !_WIN32 */
  1226. +#endif /* !_WINTIRPC */
  1227.  #include "rpc_com.h"
  1228.  
  1229.  extern bool_t __rpc_is_local_host(const char *);
  1230. diff --git a/libtirpc/src/clnt_raw.c b/libtirpc/src/clnt_raw.c
  1231. index 5a9ba46..6f1ccc1 100644
  1232. --- a/libtirpc/src/clnt_raw.c
  1233. +++ b/libtirpc/src/clnt_raw.c
  1234. @@ -37,14 +37,14 @@
  1235.   * any interference from the kernel.
  1236.   */
  1237.  #include <wintirpc.h>
  1238. -#ifndef _WIN32
  1239. +#ifndef _WINTIRPC
  1240.  #include <pthread.h>
  1241. -#endif /* !_WIN32 */
  1242. +#endif /* !_WINTIRPC */
  1243.  #include <reentrant.h>
  1244. -#ifndef _WIN32
  1245. +#ifndef _WINTIRPC
  1246.  #include <assert.h>
  1247.  #include <err.h>
  1248. -#endif /* !_WIN32 */
  1249. +#endif /* !_WINTIRPC */
  1250.  #include <stdio.h>
  1251.  #include <stdlib.h>
  1252.  
  1253. diff --git a/libtirpc/src/clnt_simple.c b/libtirpc/src/clnt_simple.c
  1254. index ae1f2bb..fd66b3e 100644
  1255. --- a/libtirpc/src/clnt_simple.c
  1256. +++ b/libtirpc/src/clnt_simple.c
  1257. @@ -29,31 +29,31 @@
  1258.   * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  1259.   */
  1260.  
  1261. -#ifndef _WIN32
  1262. +#ifndef _WINTIRPC
  1263.  #include <sys/cdefs.h>
  1264. -#endif /* !_WIN32 */
  1265. +#endif /* !_WINTIRPC */
  1266.  
  1267.  /*
  1268.   * clnt_simple.c
  1269.   * Simplified front end to client rpc.
  1270.   */
  1271.  #include <wintirpc.h>
  1272. -#ifndef _WIN32
  1273. +#ifndef _WINTIRPC
  1274.  #include <pthread.h>
  1275. -#endif /* !_WIN32 */
  1276. +#endif /* !_WINTIRPC */
  1277.  #include <reentrant.h>
  1278. -#ifndef _WIN32
  1279. +#ifndef _WINTIRPC
  1280.  #include <sys/param.h>
  1281. -#endif /* !_WIN32 */
  1282. +#endif /* !_WINTIRPC */
  1283.  #include <stdio.h>
  1284.  #include <errno.h>
  1285.  #include <rpc/rpc.h>
  1286.  #include <string.h>
  1287.  #include <stdlib.h>
  1288.  #include <fcntl.h>
  1289. -#ifndef _WIN32
  1290. +#ifndef _WINTIRPC
  1291.  #include <unistd.h>
  1292. -#endif /* !_WIN32 */
  1293. +#endif /* !_WINTIRPC */
  1294.  
  1295.  #include <rpc/clnt.h>
  1296.  
  1297. diff --git a/libtirpc/src/clnt_vc.c b/libtirpc/src/clnt_vc.c
  1298. index 8ce9074..a511c51 100644
  1299. --- a/libtirpc/src/clnt_vc.c
  1300. +++ b/libtirpc/src/clnt_vc.c
  1301. @@ -69,35 +69,35 @@
  1302.   */
  1303.  
  1304.  #include <wintirpc.h>
  1305. -#ifndef _WIN32
  1306. +#ifndef _WINTIRPC
  1307.  #include <pthread.h>
  1308. -#endif /* !_WIN32 */
  1309. +#endif /* !_WINTIRPC */
  1310.  
  1311.  #include <reentrant.h>
  1312.  #include <sys/types.h>
  1313. -#ifndef _WIN32
  1314. +#ifndef _WINTIRPC
  1315.  #include <sys/poll.h>
  1316.  #include <sys/syslog.h>
  1317.  #include <sys/un.h>
  1318.  #include <sys/uio.h>
  1319.  #include <sys/socket.h>
  1320.  #include <arpa/inet.h>
  1321. -#endif /* !_WIN32 */
  1322. +#endif /* !_WINTIRPC */
  1323.  #include <assert.h>
  1324. -#ifndef _WIN32
  1325. +#ifndef _WINTIRPC
  1326.  #include <err.h>
  1327. -#endif /* !_WIN32 */
  1328. +#endif /* !_WINTIRPC */
  1329.  #include <errno.h>
  1330. -#ifndef _WIN32
  1331. +#ifndef _WINTIRPC
  1332.  #include <netdb.h>
  1333. -#endif /* !_WIN32 */
  1334. +#endif /* !_WINTIRPC */
  1335.  #include <stdio.h>
  1336.  #include <stdlib.h>
  1337.  #include <string.h>
  1338. -#ifndef _WIN32
  1339. +#ifndef _WINTIRPC
  1340.  #include <unistd.h>
  1341.  #include <signal.h>
  1342. -#endif /* !_WIN32 */
  1343. +#endif /* !_WINTIRPC */
  1344.  #include <time.h>
  1345.  
  1346.  #include <rpc/rpc.h>
  1347. @@ -176,7 +176,7 @@ struct ct_data {
  1348.  static int      *vc_fd_locks;
  1349.  extern mutex_t  clnt_fd_lock;
  1350.  static cond_t   *vc_cv;
  1351. -#ifndef _WIN32
  1352. +#ifndef _WINTIRPC
  1353.  #define release_fd_lock(fd, mask) {    \
  1354.         mutex_lock(&clnt_fd_lock);      \
  1355.         vc_fd_locks[(fd)] = 0;          \
  1356. @@ -404,7 +404,7 @@ clnt_vc_create(
  1357.         struct timeval now;
  1358.         struct rpc_msg call_msg;
  1359.         static u_int32_t disrupt;
  1360. -#ifndef _WIN32
  1361. +#ifndef _WINTIRPC
  1362.         sigset_t mask;
  1363.         sigset_t newmask;
  1364.  #else
  1365. @@ -427,7 +427,7 @@ clnt_vc_create(
  1366.                 goto err;
  1367.         }
  1368.         ct->ct_addr.buf = NULL;
  1369. -#ifndef _WIN32
  1370. +#ifndef _WINTIRPC
  1371.         sigfillset(&newmask);
  1372.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1373.  #else
  1374. @@ -592,7 +592,7 @@ clnt_vc_call(
  1375.         static int refreshes = 2;
  1376.      u_int seq = (u_int)-1;
  1377.      time_t start_send, time_now;
  1378. -#ifndef _WIN32
  1379. +#ifndef _WINTIRPC
  1380.         sigset_t mask, newmask;
  1381.  #else
  1382.         /* XXX Need Windows signal/event stuff XXX */
  1383. @@ -603,7 +603,7 @@ clnt_vc_call(
  1384.  
  1385.         assert(cl != NULL);
  1386.  
  1387. -#ifndef _WIN32
  1388. +#ifndef _WINTIRPC
  1389.         sigfillset(&newmask);
  1390.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1391.  #else
  1392. @@ -796,7 +796,7 @@ clnt_vc_freeres(
  1393.         struct ct_data *ct;
  1394.         XDR *xdrs;
  1395.         bool_t dummy;
  1396. -#ifndef _WIN32
  1397. +#ifndef _WINTIRPC
  1398.         sigset_t mask;
  1399.         sigset_t newmask;
  1400.  #else
  1401. @@ -808,7 +808,7 @@ clnt_vc_freeres(
  1402.         ct = (struct ct_data *)cl->cl_private;
  1403.         xdrs = &(ct->ct_xdrs);
  1404.  
  1405. -#ifndef _WIN32
  1406. +#ifndef _WINTIRPC
  1407.         sigfillset(&newmask);
  1408.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1409.  #else
  1410. @@ -840,7 +840,7 @@ clnt_vc_control(
  1411.  {
  1412.         struct ct_data *ct;
  1413.         void *infop = info;
  1414. -#ifndef _WIN32
  1415. +#ifndef _WINTIRPC
  1416.         sigset_t mask;
  1417.         sigset_t newmask;
  1418.  #else
  1419. @@ -851,7 +851,7 @@ clnt_vc_control(
  1420.  
  1421.         ct = (struct ct_data *)cl->cl_private;
  1422.  
  1423. -#ifndef _WIN32
  1424. +#ifndef _WINTIRPC
  1425.         sigfillset(&newmask);
  1426.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1427.  #else
  1428. @@ -967,7 +967,7 @@ clnt_vc_destroy(CLIENT *cl)
  1429.  {
  1430.         struct ct_data *ct = (struct ct_data *) cl->cl_private;
  1431.         int ct_fd = ct->ct_fd;
  1432. -#ifndef _WIN32
  1433. +#ifndef _WINTIRPC
  1434.         sigset_t mask;
  1435.         sigset_t newmask;
  1436.  #else
  1437. @@ -978,7 +978,7 @@ clnt_vc_destroy(CLIENT *cl)
  1438.  
  1439.         ct = (struct ct_data *) cl->cl_private;
  1440.  
  1441. -#ifndef _WIN32
  1442. +#ifndef _WINTIRPC
  1443.         sigfillset(&newmask);
  1444.         thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
  1445.  #else
  1446. @@ -1105,7 +1105,7 @@ clnt_vc_ops()
  1447.  {
  1448.         static struct clnt_ops ops;
  1449.         extern mutex_t  ops_lock;
  1450. -#ifndef _WIN32
  1451. +#ifndef _WINTIRPC
  1452.         sigset_t mask, newmask;
  1453.  
  1454.         /* VARIABLES PROTECTED BY ops_lock: ops */
  1455. diff --git a/libtirpc/src/crypt_client.c b/libtirpc/src/crypt_client.c
  1456. index 3e057af..edc22d5 100644
  1457. --- a/libtirpc/src/crypt_client.c
  1458. +++ b/libtirpc/src/crypt_client.c
  1459. @@ -30,14 +30,14 @@
  1460.   * SUCH DAMAGE.
  1461.   */
  1462.  
  1463. -#ifndef _WIN32
  1464. +#ifndef _WINTIRPC
  1465.  #include <sys/cdefs.h>
  1466. -#endif /* !_WIN32 */
  1467. +#endif /* !_WINTIRPC */
  1468.  
  1469.  #include <wintirpc.h>
  1470. -#ifndef _WIN32
  1471. +#ifndef _WINTIRPC
  1472.  #include <err.h>
  1473. -#endif /* !_WIN32 */
  1474. +#endif /* !_WINTIRPC */
  1475.  #include <sys/types.h>
  1476.  #include <rpc/des_crypt.h>
  1477.  #include <rpc/des.h>
  1478. diff --git a/libtirpc/src/des_crypt.c b/libtirpc/src/des_crypt.c
  1479. index 88a88a4..c7bde54 100644
  1480. --- a/libtirpc/src/des_crypt.c
  1481. +++ b/libtirpc/src/des_crypt.c
  1482. @@ -40,9 +40,9 @@
  1483.  static char sccsid[] = "@(#)des_crypt.c        2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
  1484.  #endif
  1485.  #endif
  1486. -#ifndef _WIN32
  1487. +#ifndef _WINTIRPC
  1488.  #include <sys/cdefs.h>
  1489. -#endif /* !_WIN32 */
  1490. +#endif /* !_WINTIRPC */
  1491.  
  1492.  static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
  1493.  int (*__des_crypt_LOCAL)() = 0;
  1494. diff --git a/libtirpc/src/des_soft.c b/libtirpc/src/des_soft.c
  1495. index 39d0647..694dcc0 100644
  1496. --- a/libtirpc/src/des_soft.c
  1497. +++ b/libtirpc/src/des_soft.c
  1498. @@ -1,6 +1,6 @@
  1499. -#ifndef _WIN32
  1500. +#ifndef _WINTIRPC
  1501.  #include <sys/cdefs.h>
  1502. -#endif /* !_WIN32 */
  1503. +#endif /* !_WINTIRPC */
  1504.  
  1505.  /*
  1506.   * Copyright (c) 2009, Sun Microsystems, Inc.
  1507. diff --git a/libtirpc/src/epoll_sub.c b/libtirpc/src/epoll_sub.c
  1508. index 7345098..f514f45 100644
  1509. --- a/libtirpc/src/epoll_sub.c
  1510. +++ b/libtirpc/src/epoll_sub.c
  1511. @@ -25,7 +25,7 @@
  1512.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  1513.   */
  1514.  #include <wintirpc.h>
  1515. -#ifndef _WIN32
  1516. +#ifndef _WINTIRPC
  1517.  #include <stdint.h>
  1518.  
  1519.  #include <sys/param.h>
  1520. diff --git a/libtirpc/src/getnetconfig.c b/libtirpc/src/getnetconfig.c
  1521. index fd5b08e..4dde454 100644
  1522. --- a/libtirpc/src/getnetconfig.c
  1523. +++ b/libtirpc/src/getnetconfig.c
  1524. @@ -31,13 +31,13 @@
  1525.   */
  1526.  
  1527.  #include <wintirpc.h>
  1528. -#ifndef _WIN32
  1529. +#ifndef _WINTIRPC
  1530.  #include <pthread.h>
  1531. -#endif /* !_WIN32 */
  1532. +#endif /* !_WINTIRPC */
  1533.  #include <reentrant.h>
  1534. -#ifndef _WIN32
  1535. +#ifndef _WINTIRPC
  1536.  #include <sys/cdefs.h>
  1537. -#endif /* !_WIN32 */
  1538. +#endif /* !_WINTIRPC */
  1539.  #include <stdio.h>
  1540.  #include <errno.h>
  1541.  #include <netconfig.h>
  1542. @@ -45,9 +45,9 @@
  1543.  #include <stdlib.h>
  1544.  #include <string.h>
  1545.  #include <rpc/rpc.h>
  1546. -#ifndef _WIN32
  1547. +#ifndef _WINTIRPC
  1548.  #include <unistd.h>
  1549. -#endif /* !_WIN32 */
  1550. +#endif /* !_WINTIRPC */
  1551.  #include "rpc_com.h"
  1552.  
  1553.  
  1554. diff --git a/libtirpc/src/getnetpath.c b/libtirpc/src/getnetpath.c
  1555. index 47d5d3f..30dd13a 100644
  1556. --- a/libtirpc/src/getnetpath.c
  1557. +++ b/libtirpc/src/getnetpath.c
  1558. @@ -25,26 +25,26 @@
  1559.   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  1560.   * POSSIBILITY OF SUCH DAMAGE.
  1561.   */
  1562. -#ifndef _WIN32
  1563. +#ifndef _WINTIRPC
  1564.  #include <sys/cdefs.h>
  1565. -#endif /* !_WIN32 */
  1566. +#endif /* !_WINTIRPC */
  1567.  
  1568.  /*
  1569.   * Copyright (c) 1989 by Sun Microsystems, Inc.
  1570.   */
  1571.  
  1572. -#ifndef _WIN32
  1573. +#ifndef _WINTIRPC
  1574.  #include <sys/cdefs.h>
  1575. -#endif /* !_WIN32 */
  1576. +#endif /* !_WINTIRPC */
  1577.  #include <wintirpc.h>
  1578.  #include <stdio.h>
  1579.  #include <errno.h>
  1580.  #include <netconfig.h>
  1581.  #include <stdlib.h>
  1582.  #include <string.h>
  1583. -#ifndef _WIN32
  1584. +#ifndef _WINTIRPC
  1585.  #include <syslog.h>
  1586. -#endif /* !_WIN32 */
  1587. +#endif /* !_WINTIRPC */
  1588.  
  1589.  /*
  1590.   * internal structure to keep track of a netpath "session"
  1591. diff --git a/libtirpc/src/getpeereid.c b/libtirpc/src/getpeereid.c
  1592. index 1b078be..5ea5565 100644
  1593. --- a/libtirpc/src/getpeereid.c
  1594. +++ b/libtirpc/src/getpeereid.c
  1595. @@ -24,23 +24,23 @@
  1596.   * SUCH DAMAGE.
  1597.   */
  1598.  
  1599. -#ifndef _WIN32
  1600. +#ifndef _WINTIRPC
  1601.  #include <sys/cdefs.h>
  1602. -#endif /* !_WIN32 */
  1603. +#endif /* !_WINTIRPC */
  1604.  #include <wintirpc.h>
  1605.  #include <rpc/types.h>
  1606. -#ifndef _WIN32
  1607. +#ifndef _WINTIRPC
  1608.  #include <sys/param.h>
  1609.  #include <sys/socket.h>
  1610.  #include <sys/un.h>
  1611. -#endif /* !_WIN32 */
  1612. +#endif /* !_WINTIRPC */
  1613.  
  1614.  #include <errno.h>
  1615. -#ifndef _WIN32
  1616. +#ifndef _WINTIRPC
  1617.  #include <unistd.h>
  1618. -#endif /* !_WIN32 */
  1619. +#endif /* !_WINTIRPC */
  1620.  
  1621. -#ifdef _WIN32
  1622. +#ifdef _WINTIRPC
  1623.  int
  1624.  getpeereid(int s, uid_t *euid, gid_t *egid)
  1625.  {
  1626. diff --git a/libtirpc/src/getpublickey.c b/libtirpc/src/getpublickey.c
  1627. index 212a4cb..e15a912 100644
  1628. --- a/libtirpc/src/getpublickey.c
  1629. +++ b/libtirpc/src/getpublickey.c
  1630. @@ -38,11 +38,11 @@
  1631.   * Public key lookup routines
  1632.   */
  1633.  #include <wintirpc.h>
  1634. -#ifndef _WIN32
  1635. +#ifndef _WINTIRPC
  1636.  #include <stdio.h>
  1637. -#ifndef _WIN32
  1638. +#ifndef _WINTIRPC
  1639.  #include <pwd.h>
  1640. -#endif /* !_WIN32 */
  1641. +#endif /* !_WINTIRPC */
  1642.  #include <rpc/rpc.h>
  1643.  #include <rpc/key_prot.h>
  1644.  #include <rpcsvc/yp_prot.h>
  1645. @@ -174,4 +174,4 @@ int getpublickey(
  1646.         else
  1647.                 return(__getpublickey_real(netname, publickey));
  1648.  }
  1649. -#endif /* ! _WIN32 */
  1650. \ No newline at end of file
  1651. +#endif /* ! _WINTIRPC */
  1652. \ No newline at end of file
  1653. diff --git a/libtirpc/src/getrpcent.c b/libtirpc/src/getrpcent.c
  1654. index c4d51a5..9dd0aa9 100644
  1655. --- a/libtirpc/src/getrpcent.c
  1656. +++ b/libtirpc/src/getrpcent.c
  1657. @@ -33,15 +33,15 @@
  1658.  #include <wintirpc.h>
  1659.  #include <sys/types.h>
  1660.  
  1661. -#ifndef _WIN32
  1662. +#ifndef _WINTIRPC
  1663.  #include <netinet/in.h>
  1664.  #include <arpa/inet.h>
  1665. -#endif /* !_WIN32 */
  1666. +#endif /* !_WINTIRPC */
  1667.  
  1668.  #include <assert.h>
  1669. -#ifndef _WIN32
  1670. +#ifndef _WINTIRPC
  1671.  #include <netdb.h>
  1672. -#endif /* !_WIN32 */
  1673. +#endif /* !_WINTIRPC */
  1674.  #include <stdio.h>
  1675.  #include <stdlib.h>
  1676.  #include <string.h>
  1677. diff --git a/libtirpc/src/getrpcport.c b/libtirpc/src/getrpcport.c
  1678. index af524b5..c2e5e87 100644
  1679. --- a/libtirpc/src/getrpcport.c
  1680. +++ b/libtirpc/src/getrpcport.c
  1681. @@ -33,14 +33,14 @@
  1682.  
  1683.  #include <wintirpc.h>
  1684.  #include <sys/types.h>
  1685. -#ifndef _WIN32
  1686. +#ifndef _WINTIRPC
  1687.  #include <sys/socket.h>
  1688. -#endif /* !_WIN32 */
  1689. +#endif /* !_WINTIRPC */
  1690.  
  1691.  #include <assert.h>
  1692. -#ifndef _WIN32
  1693. +#ifndef _WINTIRPC
  1694.  #include <netdb.h>
  1695. -#endif /* !_WIN32 */
  1696. +#endif /* !_WINTIRPC */
  1697.  #include <stdio.h>
  1698.  #include <string.h>
  1699.  
  1700. diff --git a/libtirpc/src/key_call.c b/libtirpc/src/key_call.c
  1701. index 130971a..213376c 100644
  1702. --- a/libtirpc/src/key_call.c
  1703. +++ b/libtirpc/src/key_call.c
  1704. @@ -30,9 +30,9 @@
  1705.   */
  1706.  
  1707.  
  1708. -#ifndef _WIN32
  1709. +#ifndef _WINTIRPC
  1710.  #include <sys/cdefs.h>
  1711. -#endif /* !_WIN32 */
  1712. +#endif /* !_WINTIRPC */
  1713.  
  1714.  /*
  1715.   * key_call.c, Interface to keyserver
  1716. @@ -43,7 +43,7 @@
  1717.   * gendeskey(deskey) - generate a secure des key
  1718.   */
  1719.  
  1720. -#ifdef _WIN32
  1721. +#ifdef _WINTIRPC
  1722.  /*
  1723.   * Disable "warning C4206: nonstandard extension
  1724.   * used: translation unit is empty" warning
  1725. diff --git a/libtirpc/src/key_prot_xdr.c b/libtirpc/src/key_prot_xdr.c
  1726. index 08ac79b..9eab177 100644
  1727. --- a/libtirpc/src/key_prot_xdr.c
  1728. +++ b/libtirpc/src/key_prot_xdr.c
  1729. @@ -3,7 +3,7 @@
  1730.   * It was generated using rpcgen.
  1731.   */
  1732.  
  1733. -#ifdef _WIN32
  1734. +#ifdef _WINTIRPC
  1735.  /*
  1736.   * Disable "warning C4206: nonstandard extension
  1737.   * used: translation unit is empty" warning
  1738. @@ -176,4 +176,4 @@ xdr_key_netstres(register XDR *xdrs, key_netstres *objp)
  1739.         }
  1740.         return (TRUE);
  1741.  }
  1742. -#endif /* !_WIN32 */
  1743. \ No newline at end of file
  1744. +#endif /* !_WINTIRPC */
  1745. \ No newline at end of file
  1746. diff --git a/libtirpc/src/mt_misc.c b/libtirpc/src/mt_misc.c
  1747. index 46d0faf..f47662f 100644
  1748. --- a/libtirpc/src/mt_misc.c
  1749. +++ b/libtirpc/src/mt_misc.c
  1750. @@ -1,14 +1,14 @@
  1751.  #include <wintirpc.h>
  1752.  
  1753. -#ifndef _WIN32
  1754. +#ifndef _WINTIRPC
  1755.  #include <sys/cdefs.h>
  1756.  #include <pthread.h>
  1757. -#endif /* !_WIN32 */
  1758. +#endif /* !_WINTIRPC */
  1759.  #include <reentrant.h>
  1760.  #include <rpc/rpc.h>
  1761. -#ifndef _WIN32
  1762. +#ifndef _WINTIRPC
  1763.  #include <sys/time.h>
  1764. -#endif /* !_WIN32 */
  1765. +#endif /* !_WINTIRPC */
  1766.  #include <stdlib.h>
  1767.  #include <string.h>
  1768.  
  1769. @@ -106,7 +106,7 @@ mutex_t serialize_pkey;
  1770.  /* netconfig serialization */
  1771.  mutex_t nc_lock;
  1772.  
  1773. -#ifdef _WIN32
  1774. +#ifdef _WINTIRPC
  1775.  /*
  1776.   * Initialize all the mutexes (CriticalSections or SRWLOCK)
  1777.   */
  1778. diff --git a/libtirpc/src/netname.c b/libtirpc/src/netname.c
  1779. index 7d183b0..7865a86 100644
  1780. --- a/libtirpc/src/netname.c
  1781. +++ b/libtirpc/src/netname.c
  1782. @@ -35,9 +35,9 @@
  1783.   */
  1784.  
  1785.  #include <wintirpc.h>
  1786. -#ifndef _WIN32
  1787. +#ifndef _WINTIRPC
  1788.  #include <sys/param.h>
  1789. -#endif /* !_WIN32 */
  1790. +#endif /* !_WINTIRPC */
  1791.  #include <rpc/rpc.h>
  1792.  #include "rpc_com.h"
  1793.  #ifdef YP
  1794. @@ -49,9 +49,9 @@
  1795.  #include <stdio.h>
  1796.  #include <stdlib.h>
  1797.  #include <string.h>
  1798. -#ifndef _WIN32
  1799. +#ifndef _WINTIRPC
  1800.  #include <unistd.h>
  1801. -#endif /* !_WIN32 */
  1802. +#endif /* !_WINTIRPC */
  1803.  
  1804.  #ifndef MAXHOSTNAMELEN
  1805.  #define MAXHOSTNAMELEN 256
  1806. @@ -81,7 +81,7 @@ static char *OPSYS = "unix";
  1807.  int
  1808.  getnetname(char *name)
  1809.  {
  1810. -#ifdef _WIN32
  1811. +#ifdef _WINTIRPC
  1812.         /* I don't understand what these underlying routines are accomplishing??? */
  1813.         return 1;
  1814.  #else
  1815. @@ -96,7 +96,7 @@ getnetname(char *name)
  1816.  #endif
  1817.  }
  1818.  
  1819. -#ifndef _WIN32
  1820. +#ifndef _WINTIRPC
  1821.  /*
  1822.   * Convert unix cred to network-name
  1823.   */
  1824. diff --git a/libtirpc/src/netnamer.c b/libtirpc/src/netnamer.c
  1825. index ec5fdb7..5a2710d 100644
  1826. --- a/libtirpc/src/netnamer.c
  1827. +++ b/libtirpc/src/netnamer.c
  1828. @@ -33,7 +33,7 @@
  1829.   * architecture.
  1830.   */
  1831.  #include <wintirpc.h>
  1832. -#ifndef _WIN32
  1833. +#ifndef _WINTIRPC
  1834.  #include <sys/param.h>
  1835.  #include <rpc/rpc.h>
  1836.  #include "rpc_com.h"
  1837. @@ -325,4 +325,4 @@ getnetid(
  1838.                 }
  1839.         }
  1840.  }
  1841. -#endif /* !_WIN32 */
  1842. \ No newline at end of file
  1843. +#endif /* !_WINTIRPC */
  1844. \ No newline at end of file
  1845. diff --git a/libtirpc/src/pmap_clnt.c b/libtirpc/src/pmap_clnt.c
  1846. index 5b6c151..deea04e 100644
  1847. --- a/libtirpc/src/pmap_clnt.c
  1848. +++ b/libtirpc/src/pmap_clnt.c
  1849. @@ -26,9 +26,9 @@
  1850.   * POSSIBILITY OF SUCH DAMAGE.
  1851.   */
  1852.  
  1853. -#ifndef _WIN32
  1854. +#ifndef _WINTIRPC
  1855.  #include <sys/cdefs.h>
  1856. -#endif /* !_WIN32 */
  1857. +#endif /* !_WINTIRPC */
  1858.  
  1859.  /*
  1860.   * pmap_clnt.c
  1861. @@ -40,17 +40,17 @@
  1862.  #include <wintirpc.h>
  1863.  #include <sys/types.h>
  1864.  #include <sys/stat.h>
  1865. -#ifndef _WIN32
  1866. +#ifndef _WINTIRPC
  1867.  #include <unistd.h>
  1868. -#endif /* !_WIN32 */
  1869. +#endif /* !_WINTIRPC */
  1870.  
  1871.  #include <rpc/rpc.h>
  1872.  #include <rpc/pmap_prot.h>
  1873.  #include <rpc/pmap_clnt.h>
  1874.  #include <rpc/nettype.h>
  1875. -#ifndef _WIN32
  1876. +#ifndef _WINTIRPC
  1877.  #include <netinet/in.h>
  1878. -#endif /* !_WIN32 */
  1879. +#endif /* !_WINTIRPC */
  1880.  
  1881.  #include <stdio.h>
  1882.  #include <stdlib.h>
  1883. diff --git a/libtirpc/src/pmap_getmaps.c b/libtirpc/src/pmap_getmaps.c
  1884. index a2280a3..b6314b0 100644
  1885. --- a/libtirpc/src/pmap_getmaps.c
  1886. +++ b/libtirpc/src/pmap_getmaps.c
  1887. @@ -26,9 +26,9 @@
  1888.   * POSSIBILITY OF SUCH DAMAGE.
  1889.   */
  1890.  
  1891. -#ifndef _WIN32
  1892. +#ifndef _WINTIRPC
  1893.  #include <sys/cdefs.h>
  1894. -#endif /* !_WIN32 */
  1895. +#endif /* !_WINTIRPC */
  1896.  
  1897.  /*
  1898.   * pmap_getmap.c
  1899. @@ -40,29 +40,29 @@
  1900.  
  1901.  #include <wintirpc.h>
  1902.  #include <sys/types.h>
  1903. -#ifndef _WIN32
  1904. +#ifndef _WINTIRPC
  1905.  #include <sys/socket.h>
  1906.  #include <sys/ioctl.h>
  1907.  
  1908.  #include <arpa/inet.h>
  1909.  #include <net/if.h>
  1910. -#endif /* !_WIN32 */
  1911. +#endif /* !_WINTIRPC */
  1912.  
  1913.  #include <assert.h>
  1914.  #include <errno.h>
  1915. -#ifndef _WIN32
  1916. -#endif /* !_WIN32 */
  1917. +#ifndef _WINTIRPC
  1918. +#endif /* !_WINTIRPC */
  1919.  #include <stdio.h>
  1920. -#ifndef _WIN32
  1921. +#ifndef _WINTIRPC
  1922.  #include <unistd.h>
  1923. -#endif /* !_WIN32 */
  1924. +#endif /* !_WINTIRPC */
  1925.  
  1926.  #include <rpc/rpc.h>
  1927.  #include <rpc/pmap_prot.h>
  1928.  #include <rpc/pmap_clnt.h>
  1929. -#ifndef _WIN32
  1930. +#ifndef _WINTIRPC
  1931.  #include <clnt_soc.h>
  1932. -#endif /* !_WIN32 */
  1933. +#endif /* !_WINTIRPC */
  1934.  #define NAMELEN 255
  1935.  #define MAX_BROADCAST_SIZE 1400
  1936.  
  1937. diff --git a/libtirpc/src/pmap_getport.c b/libtirpc/src/pmap_getport.c
  1938. index 9839515..4681574 100644
  1939. --- a/libtirpc/src/pmap_getport.c
  1940. +++ b/libtirpc/src/pmap_getport.c
  1941. @@ -28,17 +28,17 @@
  1942.  
  1943.  #include <wintirpc.h>
  1944.  #include <sys/types.h>
  1945. -#ifndef _WIN32
  1946. +#ifndef _WINTIRPC
  1947.  #include <sys/socket.h>
  1948.  
  1949.  #include <arpa/inet.h>
  1950.  #include <net/if.h>
  1951. -#endif /* !_WIN32 */
  1952. +#endif /* !_WINTIRPC */
  1953.  
  1954.  #include <assert.h>
  1955. -#ifndef _WIN32
  1956. +#ifndef _WINTIRPC
  1957.  #include <unistd.h>
  1958. -#endif /* !_WIN32 */
  1959. +#endif /* !_WINTIRPC */
  1960.  
  1961.  #include <rpc/rpc.h>
  1962.  #include <rpc/pmap_prot.h>
  1963. @@ -47,7 +47,7 @@
  1964.  static const struct timeval timeout = { 5, 0 };
  1965.  static const struct timeval tottimeout = { 60, 0 };
  1966.  
  1967. -#ifdef _WIN32
  1968. +#ifdef _WINTIRPC
  1969.  /*
  1970.   * pmap_getport.c
  1971.   * Client interface to pmap rpc service.
  1972. @@ -111,4 +111,4 @@ pmap_getport(
  1973.         address->sin_port = 0;
  1974.         return (port);
  1975.  }
  1976. -#endif /* ! _WIN32 */
  1977. +#endif /* ! _WINTIRPC */
  1978. diff --git a/libtirpc/src/pmap_rmt.c b/libtirpc/src/pmap_rmt.c
  1979. index 269e7dc..adc0da5 100644
  1980. --- a/libtirpc/src/pmap_rmt.c
  1981. +++ b/libtirpc/src/pmap_rmt.c
  1982. @@ -36,7 +36,7 @@
  1983.  
  1984.  #include <wintirpc.h>
  1985.  #include <sys/types.h>
  1986. -#ifndef _WIN32
  1987. +#ifndef _WINTIRPC
  1988.  #include <sys/ioctl.h>
  1989.  #include <sys/poll.h>
  1990.  #include <sys/socket.h>
  1991. @@ -44,18 +44,18 @@
  1992.  #include <net/if.h>
  1993.  #include <netinet/in.h>
  1994.  #include <arpa/inet.h>
  1995. -#endif /* !_WIN32 */
  1996. +#endif /* !_WINTIRPC */
  1997.  
  1998.  #include <assert.h>
  1999. -#ifndef _WIN32
  2000. +#ifndef _WINTIRPC
  2001.  #include <err.h>
  2002. -#endif /* !_WIN32 */
  2003. +#endif /* !_WINTIRPC */
  2004.  #include <errno.h>
  2005.  #include <stdio.h>
  2006.  #include <string.h>
  2007. -#ifndef _WIN32
  2008. +#ifndef _WINTIRPC
  2009.  #include <unistd.h>
  2010. -#endif /* !_WIN32 */
  2011. +#endif /* !_WINTIRPC */
  2012.  
  2013.  #include <rpc/rpc.h>
  2014.  #include <rpc/pmap_prot.h>
  2015. @@ -63,9 +63,9 @@
  2016.  #include <rpc/pmap_rmt.h>
  2017.  
  2018.  // For the clnttcp_create function
  2019. -#ifndef _WIN32
  2020. +#ifndef _WINTIRPC
  2021.  #include <clnt_soc.h>
  2022. -#endif /* !_WIN32 */
  2023. +#endif /* !_WINTIRPC */
  2024.  
  2025.  
  2026.  static const struct timeval timeout = { 3, 0 };
  2027. diff --git a/libtirpc/src/rpc_callmsg.c b/libtirpc/src/rpc_callmsg.c
  2028. index b40c870..7dd5de7 100644
  2029. --- a/libtirpc/src/rpc_callmsg.c
  2030. +++ b/libtirpc/src/rpc_callmsg.c
  2031. @@ -41,9 +41,9 @@
  2032.  #include <rpc/rpc.h>
  2033.  #include <rpc/xdr.h>
  2034.  
  2035. -#ifndef _WIN32
  2036. +#ifndef _WINTIRPC
  2037.  #include <sys/select.h>
  2038. -#endif /* !_WIN32 */
  2039. +#endif /* !_WINTIRPC */
  2040.  
  2041.  /*
  2042.   * XDR a call message
  2043. diff --git a/libtirpc/src/rpc_com.h b/libtirpc/src/rpc_com.h
  2044. index 28bb986..01dcf52 100644
  2045. --- a/libtirpc/src/rpc_com.h
  2046. +++ b/libtirpc/src/rpc_com.h
  2047. @@ -40,9 +40,9 @@
  2048.  #ifndef _TIRPC_RPCCOM_H
  2049.  #define        _TIRPC_RPCCOM_H
  2050.  
  2051. -#ifndef _WIN32
  2052. +#ifndef _WINTIRPC
  2053.  #include <sys/cdefs.h>
  2054. -#endif /* !_WIN32 */
  2055. +#endif /* !_WINTIRPC */
  2056.  
  2057.  /* #pragma ident       "@(#)rpc_com.h  1.11    93/07/05 SMI" */
  2058.  
  2059. @@ -53,7 +53,7 @@
  2060.  #define        RPC_MAXDATASIZE 9000
  2061.  #define        RPC_MAXADDRSIZE 1024
  2062.  
  2063. -//#ifdef _WIN32
  2064. +//#ifdef _WINTIRPC
  2065.  //     #define __RPC_GETXID(now) ((u_int32_t)_getpid() ^ (u_int32_t)(now)->tv_sec ^ \
  2066.  //             (u_int32_t)(now)->tv_usec)
  2067.  //#else
  2068. diff --git a/libtirpc/src/rpc_dtablesize.c b/libtirpc/src/rpc_dtablesize.c
  2069. index 48f05a5..2142692 100644
  2070. --- a/libtirpc/src/rpc_dtablesize.c
  2071. +++ b/libtirpc/src/rpc_dtablesize.c
  2072. @@ -27,11 +27,11 @@
  2073.   */
  2074.  
  2075.  #include <wintirpc.h>
  2076. -#ifndef _WIN32
  2077. +#ifndef _WINTIRPC
  2078.  #include <unistd.h>
  2079.  
  2080.  #include <sys/select.h>
  2081. -#endif /* !_WIN32 */
  2082. +#endif /* !_WINTIRPC */
  2083.  
  2084.  int _rpc_dtablesize(void);     /* XXX */
  2085.  
  2086. @@ -49,7 +49,7 @@ int _rpc_dtablesize(void);    /* XXX */
  2087.  int
  2088.  _rpc_dtablesize(void)
  2089.  {
  2090. -#ifdef _WIN32
  2091. +#ifdef _WINTIRPC
  2092.         return FD_SETSIZE;
  2093.  #else
  2094.         static int size;
  2095. diff --git a/libtirpc/src/rpc_generic.c b/libtirpc/src/rpc_generic.c
  2096. index b9a6726..3f3501c 100644
  2097. --- a/libtirpc/src/rpc_generic.c
  2098. +++ b/libtirpc/src/rpc_generic.c
  2099. @@ -29,21 +29,21 @@
  2100.   * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  2101.   */
  2102.  
  2103. -#ifndef _WIN32
  2104. +#ifndef _WINTIRPC
  2105.  #include <sys/cdefs.h>
  2106. -#endif /* !_WIN32 */
  2107. +#endif /* !_WINTIRPC */
  2108.  
  2109.  /*
  2110.   * rpc_generic.c, Miscl routines for RPC.
  2111.   *
  2112.   */
  2113.  #include <wintirpc.h>
  2114. -#ifndef _WIN32
  2115. +#ifndef _WINTIRPC
  2116.  #include <pthread.h>
  2117. -#endif /* !_WIN32 */
  2118. +#endif /* !_WINTIRPC */
  2119.  #include <reentrant.h>
  2120.  #include <sys/types.h>
  2121. -#ifndef _WIN32
  2122. +#ifndef _WINTIRPC
  2123.  #include <sys/param.h>
  2124.  #include <sys/socket.h>
  2125.  #include <sys/time.h>
  2126. @@ -51,20 +51,20 @@
  2127.  #include <sys/resource.h>
  2128.  #include <netinet/in.h>
  2129.  #include <arpa/inet.h>
  2130. -#endif /* !_WIN32 */
  2131. +#endif /* !_WINTIRPC */
  2132.  #include <rpc/rpc.h>
  2133. -#ifndef _WIN32
  2134. +#ifndef _WINTIRPC
  2135.  #include <ctype.h>
  2136.  #include <stddef.h>
  2137. -#endif /* !_WIN32 */
  2138. +#endif /* !_WINTIRPC */
  2139.  #include <stdio.h>
  2140. -#ifndef _WIN32
  2141. +#ifndef _WINTIRPC
  2142.  #include <netdb.h>
  2143. -#endif /* !_WIN32 */
  2144. +#endif /* !_WINTIRPC */
  2145.  #include <netconfig.h>
  2146.  #include <stdlib.h>
  2147.  #include <string.h>
  2148. -#ifndef _WIN32
  2149. +#ifndef _WINTIRPC
  2150.  #include <syslog.h>
  2151.  #endif
  2152.  #include <rpc/nettype.h>
  2153. @@ -121,7 +121,7 @@ static int getnettype(const char *);
  2154.  int
  2155.  __rpc_dtbsize()
  2156.  {
  2157. -#ifdef _WIN32
  2158. +#ifdef _WINTIRPC
  2159.          /* gisburn: Is |FD_SETSIZE| really correct here ? */
  2160.         return (FD_SETSIZE);
  2161.  #else
  2162. @@ -493,7 +493,7 @@ __rpc_fd2sockinfo(int fd, struct __rpc_sockinfo *sip)
  2163.         int type, proto;
  2164.         struct sockaddr_storage ss;
  2165.  
  2166. -#ifdef _WIN32
  2167. +#ifdef _WINTIRPC
  2168.         WSAPROTOCOL_INFO proto_info;
  2169.         int proto_info_size = sizeof(proto_info);
  2170.         if (wintirpc_getsockopt(fd, SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) {
  2171. @@ -567,7 +567,7 @@ __rpc_nconf2fd(const struct netconfig *nconf)
  2172.         struct __rpc_sockinfo si;
  2173.         int fd;
  2174.  
  2175. -#ifdef _WIN32
  2176. +#ifdef _WINTIRPC
  2177.         if (!wintirpc_winsock_init())
  2178.                 return 0;
  2179.  #endif
  2180. diff --git a/libtirpc/src/rpc_prot.c b/libtirpc/src/rpc_prot.c
  2181. index e19136e..91c2c94 100644
  2182. --- a/libtirpc/src/rpc_prot.c
  2183. +++ b/libtirpc/src/rpc_prot.c
  2184. @@ -63,9 +63,9 @@
  2185.   */
  2186.  
  2187.  #include <wintirpc.h>
  2188. -#ifndef _WIN32
  2189. +#ifndef _WINTIRPC
  2190.  #include <sys/param.h>
  2191. -#endif /* !_WIN32 */
  2192. +#endif /* !_WINTIRPC */
  2193.  
  2194.  #include <assert.h>
  2195.  
  2196. diff --git a/libtirpc/src/rpc_soc.c b/libtirpc/src/rpc_soc.c
  2197. index 98b0118..07ddd9c 100644
  2198. --- a/libtirpc/src/rpc_soc.c
  2199. +++ b/libtirpc/src/rpc_soc.c
  2200. @@ -34,7 +34,7 @@
  2201.   * California.
  2202.   */
  2203.  
  2204. -#if defined(PORTMAP) || defined (_WIN32)
  2205. +#if defined(PORTMAP) || defined (_WINTIRPC)
  2206.  /*
  2207.   * rpc_soc.c
  2208.   *
  2209. @@ -44,32 +44,32 @@
  2210.   * of TLI/Streams
  2211.   */
  2212.  #include <wintirpc.h>
  2213. -#ifndef _WIN32
  2214. +#ifndef _WINTIRPC
  2215.  #include <pthread.h>
  2216. -#endif /* !_WIN32 */
  2217. +#endif /* !_WINTIRPC */
  2218.  #include <reentrant.h>
  2219.  #include <sys/types.h>
  2220. -#ifndef _WIN32
  2221. +#ifndef _WINTIRPC
  2222.  #include <sys/socket.h>
  2223. -#endif /* !_WIN32 */
  2224. +#endif /* !_WINTIRPC */
  2225.  #include <stdio.h>
  2226.  #include <rpc/rpc.h>
  2227.  #include <rpc/pmap_clnt.h>
  2228.  #include <rpc/pmap_prot.h>
  2229.  #include <rpc/nettype.h>
  2230. -#ifndef _WIN32
  2231. +#ifndef _WINTIRPC
  2232.  #include <syslog.h>
  2233.  #endif
  2234. -#ifndef _WIN32
  2235. +#ifndef _WINTIRPC
  2236.  #include <netinet/in.h>
  2237.  #include <netdb.h>
  2238. -#endif /* !_WIN32 */
  2239. +#endif /* !_WINTIRPC */
  2240.  #include <errno.h>
  2241.  #include <stdlib.h>
  2242.  #include <string.h>
  2243. -#ifndef _WIN32
  2244. +#ifndef _WINTIRPC
  2245.  #include <unistd.h>
  2246. -#endif /* !_WIN32 */
  2247. +#endif /* !_WINTIRPC */
  2248.  
  2249.  #include "rpc_com.h"
  2250.  
  2251. @@ -495,7 +495,7 @@ clnt_broadcast(
  2252.             (resultproc_t) rpc_wrap_bcast, "udp");
  2253.  }
  2254.  
  2255. -#ifndef _WIN32
  2256. +#ifndef _WINTIRPC
  2257.  /*
  2258.   * Create the client des authentication object. Obsoleted by
  2259.   * authdes_seccreate().
  2260. diff --git a/libtirpc/src/rpcb_clnt.c b/libtirpc/src/rpcb_clnt.c
  2261. index a168f67..5b48338 100644
  2262. --- a/libtirpc/src/rpcb_clnt.c
  2263. +++ b/libtirpc/src/rpcb_clnt.c
  2264. @@ -36,35 +36,35 @@
  2265.   * Copyright (C) 1988, Sun Microsystems, Inc.
  2266.   */
  2267.  #include <wintirpc.h>
  2268. -#ifndef _WIN32
  2269. +#ifndef _WINTIRPC
  2270.  #include <pthread.h>
  2271. -#endif /* !_WIN32 */
  2272. +#endif /* !_WINTIRPC */
  2273.  #include <reentrant.h>
  2274.  #include <sys/types.h>
  2275. -#ifndef _WIN32
  2276. +#ifndef _WINTIRPC
  2277.  #include <sys/socket.h>
  2278.  #include <sys/un.h>
  2279.  #include <sys/utsname.h>
  2280. -#endif /* !_WIN32 */
  2281. +#endif /* !_WINTIRPC */
  2282.  #include <rpc/rpc.h>
  2283.  #include <rpc/rpcb_prot.h>
  2284.  #include <rpc/nettype.h>
  2285.  #include <netconfig.h>
  2286.  #ifdef PORTMAP
  2287. -#ifndef _WIN32
  2288. +#ifndef _WINTIRPC
  2289.  #include <netinet/in.h>                /* FOR IPPROTO_TCP/UDP definitions */
  2290. -#endif /* !_WIN32 */
  2291. +#endif /* !_WINTIRPC */
  2292.  #include <rpc/pmap_prot.h>
  2293.  #endif                         /* PORTMAP */
  2294.  #include <stdio.h>
  2295.  #include <errno.h>
  2296.  #include <stdlib.h>
  2297.  #include <string.h>
  2298. -#ifndef _WIN32
  2299. +#ifndef _WINTIRPC
  2300.  #include <unistd.h>
  2301.  #include <netdb.h>
  2302.  #include <syslog.h>
  2303. -#endif /* !_WIN32 */
  2304. +#endif /* !_WINTIRPC */
  2305.  
  2306.  #include "rpc_com.h"
  2307.  
  2308. @@ -1108,7 +1108,7 @@ error:
  2309.         return (stat);
  2310.  }
  2311.  
  2312. -#ifndef _WIN32
  2313. +#ifndef _WINTIRPC
  2314.  /*
  2315.   * Gets the time on the remote host.
  2316.   * Returns 1 if succeeds else 0.
  2317. diff --git a/libtirpc/src/rpcb_st_xdr.c b/libtirpc/src/rpcb_st_xdr.c
  2318. index cf15bac..ff384a4 100644
  2319. --- a/libtirpc/src/rpcb_st_xdr.c
  2320. +++ b/libtirpc/src/rpcb_st_xdr.c
  2321. @@ -35,9 +35,9 @@
  2322.   * routines used with the rpcbind stats facility.
  2323.   */
  2324.  
  2325. -#ifndef _WIN32
  2326. +#ifndef _WINTIRPC
  2327.  #include <sys/cdefs.h>
  2328. -#endif /* !_WIN32 */
  2329. +#endif /* !_WINTIRPC */
  2330.  
  2331.  #include <wintirpc.h>
  2332.  #include <rpc/rpc.h>
  2333. diff --git a/libtirpc/src/rpcdname.c b/libtirpc/src/rpcdname.c
  2334. index bf5440d..26133a7 100644
  2335. --- a/libtirpc/src/rpcdname.c
  2336. +++ b/libtirpc/src/rpcdname.c
  2337. @@ -25,9 +25,9 @@
  2338.   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  2339.   * POSSIBILITY OF SUCH DAMAGE.
  2340.   */
  2341. -#ifndef _WIN32
  2342. +#ifndef _WINTIRPC
  2343.  #include <sys/cdefs.h>
  2344. -#endif /* !_WIN32 */
  2345. +#endif /* !_WINTIRPC */
  2346.  
  2347.  /*
  2348.   * rpcdname.c
  2349. @@ -36,9 +36,9 @@
  2350.  
  2351.  #include <wintirpc.h>
  2352.  #include <stdlib.h>
  2353. -#ifndef _WIN32
  2354. +#ifndef _WINTIRPC
  2355.  #include <unistd.h>
  2356. -#endif /* !_WIN32 */
  2357. +#endif /* !_WINTIRPC */
  2358.  #include <string.h>
  2359.  
  2360.  static char *default_domain = NULL;
  2361. @@ -46,13 +46,13 @@ static char *default_domain = NULL;
  2362.  static char *
  2363.  get_default_domain()
  2364.  {
  2365. -#ifndef _WIN32
  2366. +#ifndef _WINTIRPC
  2367.         char temp[256];
  2368.  #endif
  2369.  
  2370.         if (default_domain)
  2371.                 return (default_domain);
  2372. -#ifndef _WIN32 // Need a WIN32 version?
  2373. +#ifndef _WINTIRPC      // Need a WIN32 version?
  2374.         if (getdomainname(temp, sizeof(temp)) < 0)
  2375.                 return (0);
  2376.         if ((int) strlen(temp) > 0) {
  2377. diff --git a/libtirpc/src/rtime.c b/libtirpc/src/rtime.c
  2378. index 7894361..55c3efb 100644
  2379. --- a/libtirpc/src/rtime.c
  2380. +++ b/libtirpc/src/rtime.c
  2381. @@ -41,26 +41,26 @@
  2382.   * what unix uses.
  2383.   */
  2384.  #include <wintirpc.h>
  2385. -#ifndef _WIN32
  2386. +#ifndef _WINTIRPC
  2387.  #include <pthread.h>
  2388. -#endif /* !_WIN32 */
  2389. +#endif /* !_WINTIRPC */
  2390.  #include <stdlib.h>
  2391.  #include <string.h>
  2392. -#ifndef _WIN32
  2393. +#ifndef _WINTIRPC
  2394.  #include <unistd.h>
  2395. -#endif /* !_WIN32 */
  2396. +#endif /* !_WINTIRPC */
  2397.  #include <errno.h>
  2398.  #include <sys/types.h>
  2399. -#ifndef _WIN32
  2400. +#ifndef _WINTIRPC
  2401.  #include <sys/socket.h>
  2402.  #include <sys/time.h>
  2403.  #include <netinet/in.h>
  2404. -#endif /* !_WIN32 */
  2405. +#endif /* !_WINTIRPC */
  2406.  #include <stdio.h>
  2407. -#ifndef _WIN32
  2408. +#ifndef _WINTIRPC
  2409.  #include <netdb.h>
  2410.  #include <sys/select.h>
  2411. -#endif /* !_WIN32 */
  2412. +#endif /* !_WINTIRPC */
  2413.  
  2414.  extern int _rpc_dtablesize( void );
  2415.  
  2416. diff --git a/libtirpc/src/svc.c b/libtirpc/src/svc.c
  2417. index 8c5a210..e0bcc88 100644
  2418. --- a/libtirpc/src/svc.c
  2419. +++ b/libtirpc/src/svc.c
  2420. @@ -37,15 +37,15 @@
  2421.   * Copyright (C) 1984, Sun Microsystems, Inc.
  2422.   */
  2423.  #include <wintirpc.h>
  2424. -#ifndef _WIN32
  2425. +#ifndef _WINTIRPC
  2426.  #include <pthread.h>
  2427. -#endif /* !_WIN32 */
  2428. +#endif /* !_WINTIRPC */
  2429.  
  2430.  #include <reentrant.h>
  2431.  #include <sys/types.h>
  2432. -#ifndef _WIN32
  2433. +#ifndef _WINTIRPC
  2434.  #include <sys/poll.h>
  2435. -#endif /* !_WIN32 */
  2436. +#endif /* !_WINTIRPC */
  2437.  #include <assert.h>
  2438.  #include <errno.h>
  2439.  #include <stdlib.h>
  2440. @@ -115,7 +115,7 @@ xprt_register (SVCXPRT *xprt)
  2441.        }
  2442.        memset (__svc_xports, 0, FD_SETSIZE * sizeof (SVCXPRT *));
  2443.    }
  2444. -#ifndef _WIN32
  2445. +#ifndef _WINTIRPC
  2446.    if (sock < FD_SETSIZE) {
  2447.      __svc_xports[sock] = xprt;
  2448.      FD_SET(wintirpc_fd2sockethandle(sock), &svc_fdset);
  2449. @@ -154,7 +154,7 @@ __xprt_do_unregister (
  2450.  
  2451.    sock = xprt->xp_fd;
  2452.  
  2453. -#ifndef _WIN32
  2454. +#ifndef _WINTIRPC
  2455.    if (dolock)
  2456.      rwlock_wrlock (&svc_fd_lock);
  2457.    if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) {
  2458. @@ -612,7 +612,7 @@ svc_getreq (int rdfds)
  2459.  void
  2460.  svc_getreqset (fd_set *readfds)
  2461.  {
  2462. -#ifndef _WIN32
  2463. +#ifndef _WINTIRPC
  2464.    int bit, fd;
  2465.    fd_mask mask, *maskp;
  2466.    int sock;
  2467. diff --git a/libtirpc/src/svc_auth.c b/libtirpc/src/svc_auth.c
  2468. index b6e9f68..c732138 100644
  2469. --- a/libtirpc/src/svc_auth.c
  2470. +++ b/libtirpc/src/svc_auth.c
  2471. @@ -35,9 +35,9 @@
  2472.   *
  2473.   */
  2474.  #include <wintirpc.h>
  2475. -#ifndef _WIN32
  2476. +#ifndef _WINTIRPC
  2477.  #include <pthread.h>
  2478. -#endif /* !_WIN32 */
  2479. +#endif /* !_WINTIRPC */
  2480.  #include <reentrant.h>
  2481.  #include <sys/types.h>
  2482.  #include <rpc/rpc.h>
  2483. diff --git a/libtirpc/src/svc_auth_des.c b/libtirpc/src/svc_auth_des.c
  2484. index 73fb004..bc8607c 100644
  2485. --- a/libtirpc/src/svc_auth_des.c
  2486. +++ b/libtirpc/src/svc_auth_des.c
  2487. @@ -45,21 +45,21 @@
  2488.   *
  2489.   */
  2490.  #include <wintirpc.h>
  2491. -#ifndef _WIN32
  2492. +#ifndef _WINTIRPC
  2493.  #include <pthread.h>
  2494. -#endif /* !_WIN32 */
  2495. +#endif /* !_WINTIRPC */
  2496.  #include <reentrant.h>
  2497.  #include <string.h>
  2498.  #include <stdlib.h>
  2499.  #include <stdio.h>
  2500. -#ifndef _WIN32
  2501. +#ifndef _WINTIRPC
  2502.  #include <unistd.h>
  2503. -#endif /* !_WIN32 */
  2504. +#endif /* !_WINTIRPC */
  2505.  #include <rpc/des_crypt.h>
  2506. -#ifndef _WIN32
  2507. +#ifndef _WINTIRPC
  2508.  #include <sys/param.h>
  2509.  #include <netinet/in.h>
  2510. -#endif /* !_WIN32 */
  2511. +#endif /* !_WINTIRPC */
  2512.  #include <rpc/types.h>
  2513.  #include <rpc/xdr.h>
  2514.  #include <rpc/auth.h>
  2515. diff --git a/libtirpc/src/svc_auth_unix.c b/libtirpc/src/svc_auth_unix.c
  2516. index 27598e6..ce63356 100644
  2517. --- a/libtirpc/src/svc_auth_unix.c
  2518. +++ b/libtirpc/src/svc_auth_unix.c
  2519. @@ -37,9 +37,9 @@
  2520.   * Copyright (C) 1984, Sun Microsystems, Inc.
  2521.   */
  2522.  #include <wintirpc.h>
  2523. -#ifndef _WIN32
  2524. +#ifndef _WINTIRPC
  2525.  #include <pthread.h>
  2526. -#endif /* !_WIN32 */
  2527. +#endif /* !_WINTIRPC */
  2528.  #include <assert.h>
  2529.  #include <stdio.h>
  2530.  #include <string.h>
  2531. diff --git a/libtirpc/src/svc_dg.c b/libtirpc/src/svc_dg.c
  2532. index d172dfd..6848f68 100644
  2533. --- a/libtirpc/src/svc_dg.c
  2534. +++ b/libtirpc/src/svc_dg.c
  2535. @@ -31,9 +31,9 @@
  2536.   * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  2537.   */
  2538.  
  2539. -#ifndef _WIN32
  2540. +#ifndef _WINTIRPC
  2541.  #include <sys/cdefs.h>
  2542. -#endif /* !_WIN32 */
  2543. +#endif /* !_WINTIRPC */
  2544.  
  2545.  /*
  2546.   * svc_dg.c, Server side for connectionless RPC.
  2547. @@ -41,20 +41,20 @@
  2548.   * Does some caching in the hopes of achieving execute-at-most-once semantics.
  2549.   */
  2550.  #include <wintirpc.h>
  2551. -#ifndef _WIN32
  2552. +#ifndef _WINTIRPC
  2553.  #include <pthread.h>
  2554. -#endif /* !_WIN32 */
  2555. +#endif /* !_WINTIRPC */
  2556.  #include <reentrant.h>
  2557.  #include <sys/types.h>
  2558. -#ifndef _WIN32
  2559. +#ifndef _WINTIRPC
  2560.  #include <sys/socket.h>
  2561. -#endif /* !_WIN32 */
  2562. +#endif /* !_WINTIRPC */
  2563.  #include <rpc/rpc.h>
  2564.  #include <rpc/svc_dg.h>
  2565.  #include <errno.h>
  2566. -#ifndef _WIN32
  2567. +#ifndef _WINTIRPC
  2568.  #include <unistd.h>
  2569. -#endif /* !_WIN32 */
  2570. +#endif /* !_WINTIRPC */
  2571.  #include <stdio.h>
  2572.  #include <stdlib.h>
  2573.  #include <string.h>
  2574. @@ -62,9 +62,9 @@
  2575.  #include <netconfig.h>
  2576.  #include <netdir.h>
  2577.  #endif
  2578. -#ifndef _WIN32
  2579. +#ifndef _WINTIRPC
  2580.  #include <err.h>
  2581. -#endif /* !_WIN32 */
  2582. +#endif /* !_WINTIRPC */
  2583.  
  2584.  #include "rpc_com.h"
  2585.  
  2586. diff --git a/libtirpc/src/svc_generic.c b/libtirpc/src/svc_generic.c
  2587. index 5a0e65e..4cdfb73 100644
  2588. --- a/libtirpc/src/svc_generic.c
  2589. +++ b/libtirpc/src/svc_generic.c
  2590. @@ -36,25 +36,25 @@
  2591.   *
  2592.   */
  2593.  #include <wintirpc.h>
  2594. -#ifndef _WIN32
  2595. +#ifndef _WINTIRPC
  2596.  #include <pthread.h>
  2597. -#endif /* !_WIN32 */
  2598. +#endif /* !_WINTIRPC */
  2599.  #include <reentrant.h>
  2600.  #include <sys/types.h>
  2601. -#ifndef _WIN32
  2602. +#ifndef _WINTIRPC
  2603.  #include <sys/socket.h>
  2604.  #include <netinet/in.h>
  2605. -#endif /* !_WIN32 */
  2606. +#endif /* !_WINTIRPC */
  2607.  #include <rpc/rpc.h>
  2608.  #include <rpc/nettype.h>
  2609.  #include <stdio.h>
  2610.  #include <errno.h>
  2611.  #include <stdlib.h>
  2612.  #include <string.h>
  2613. -#ifndef _WIN32
  2614. +#ifndef _WINTIRPC
  2615.  #include <unistd.h>
  2616.  #include <err.h>
  2617. -#endif /* !_WIN32 */
  2618. +#endif /* !_WINTIRPC */
  2619.  
  2620.  #include "rpc_com.h"
  2621.  #include <rpc/svc.h>
  2622. diff --git a/libtirpc/src/svc_raw.c b/libtirpc/src/svc_raw.c
  2623. index d3e2e97..2962a8e 100644
  2624. --- a/libtirpc/src/svc_raw.c
  2625. +++ b/libtirpc/src/svc_raw.c
  2626. @@ -38,9 +38,9 @@
  2627.   *
  2628.   */
  2629.  #include <wintirpc.h>
  2630. -#ifndef _WIN32
  2631. +#ifndef _WINTIRPC
  2632.  #include <pthread.h>
  2633. -#endif /* !_WIN32 */
  2634. +#endif /* !_WINTIRPC */
  2635.  #include <reentrant.h>
  2636.  #include <rpc/rpc.h>
  2637.  #include <sys/types.h>
  2638. diff --git a/libtirpc/src/svc_run.c b/libtirpc/src/svc_run.c
  2639. index bfab92e..5f3ec45 100644
  2640. --- a/libtirpc/src/svc_run.c
  2641. +++ b/libtirpc/src/svc_run.c
  2642. @@ -31,26 +31,26 @@
  2643.   * Wait for input, call server program.
  2644.   */
  2645.  #include <wintirpc.h>
  2646. -#ifndef _WIN32
  2647. +#ifndef _WINTIRPC
  2648.  #include <pthread.h>
  2649. -#endif /* !_WIN32 */
  2650. +#endif /* !_WINTIRPC */
  2651.  #include <reentrant.h>
  2652. -#ifndef _WIN32
  2653. +#ifndef _WINTIRPC
  2654.  #include <err.h>
  2655. -#endif /* !_WIN32 */
  2656. +#endif /* !_WINTIRPC */
  2657.  #include <errno.h>
  2658.  #include <rpc/rpc.h>
  2659.  #include <stdio.h>
  2660.  #include <string.h>
  2661. -#ifndef _WIN32
  2662. +#ifndef _WINTIRPC
  2663.  #include <unistd.h>
  2664. -#endif /* !_WIN32 */
  2665. +#endif /* !_WINTIRPC */
  2666.  
  2667.  #include <rpc/rpc.h>
  2668.  #include "rpc_com.h"
  2669. -#ifndef _WIN32
  2670. +#ifndef _WINTIRPC
  2671.  #include <sys/select.h>
  2672. -#endif /* !_WIN32 */
  2673. +#endif /* !_WINTIRPC */
  2674.  
  2675.  void
  2676.  svc_run()
  2677. diff --git a/libtirpc/src/svc_simple.c b/libtirpc/src/svc_simple.c
  2678. index f4bc47a..3238465 100644
  2679. --- a/libtirpc/src/svc_simple.c
  2680. +++ b/libtirpc/src/svc_simple.c
  2681. @@ -29,9 +29,9 @@
  2682.   * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  2683.   */
  2684.  
  2685. -#ifndef _WIN32
  2686. +#ifndef _WINTIRPC
  2687.  #include <sys/cdefs.h>
  2688. -#endif /* !_WIN32 */
  2689. +#endif /* !_WINTIRPC */
  2690.  
  2691.  /*
  2692.   * svc_simple.c
  2693. @@ -45,9 +45,9 @@
  2694.   * for the given prognum and procnum.
  2695.   */
  2696.  #include <wintirpc.h>
  2697. -#ifndef _WIN32
  2698. +#ifndef _WINTIRPC
  2699.  #include <pthread.h>
  2700. -#endif /* !_WIN32 */
  2701. +#endif /* !_WINTIRPC */
  2702.  #include <reentrant.h>
  2703.  #include <sys/types.h>
  2704.  #include <rpc/rpc.h>
  2705. @@ -56,9 +56,9 @@
  2706.  #include <stdlib.h>
  2707.  #include <string.h>
  2708.  #include <wintirpc.h>
  2709. -#ifndef _WIN32
  2710. +#ifndef _WINTIRPC
  2711.  #include <err.h>
  2712. -#endif /* !_WIN32 */
  2713. +#endif /* !_WINTIRPC */
  2714.  
  2715.  #include "rpc_com.h"
  2716.  
  2717. diff --git a/libtirpc/src/svc_vc.c b/libtirpc/src/svc_vc.c
  2718. index df06002..55beaf9 100644
  2719. --- a/libtirpc/src/svc_vc.c
  2720. +++ b/libtirpc/src/svc_vc.c
  2721. @@ -27,9 +27,9 @@
  2722.   * POSSIBILITY OF SUCH DAMAGE.
  2723.   */
  2724.  
  2725. -#ifndef _WIN32
  2726. +#ifndef _WINTIRPC
  2727.  #include <sys/cdefs.h>
  2728. -#endif /* !_WIN32 */
  2729. +#endif /* !_WINTIRPC */
  2730.  
  2731.  /*
  2732.   * svc_vc.c, Server side for Connection Oriented based RPC.
  2733. @@ -39,15 +39,15 @@
  2734.   * and a record/tcp stream.
  2735.   */
  2736.  #include <wintirpc.h>
  2737. -#ifndef _WIN32
  2738. +#ifndef _WINTIRPC
  2739.  #include <pthread.h>
  2740. -#endif /* !_WIN32 */
  2741. +#endif /* !_WINTIRPC */
  2742.  #include <reentrant.h>
  2743. -#ifndef _WIN32
  2744. +#ifndef _WINTIRPC
  2745.  #include <sys/socket.h>
  2746. -#endif /* !_WIN32 */
  2747. +#endif /* !_WINTIRPC */
  2748.  #include <sys/types.h>
  2749. -#ifndef _WIN32
  2750. +#ifndef _WINTIRPC
  2751.  #include <sys/param.h>
  2752.  #include <sys/poll.h>
  2753.  #include <sys/un.h>
  2754. @@ -55,20 +55,20 @@
  2755.  #include <sys/uio.h>
  2756.  #include <netinet/in.h>
  2757.  #include <netinet/tcp.h>
  2758. -#endif /* !_WIN32 */
  2759. +#endif /* !_WINTIRPC */
  2760.  
  2761. -#ifndef _WIN32
  2762. +#ifndef _WINTIRPC
  2763.  #include <assert.h>
  2764.  #include <err.h>
  2765. -#endif /* !_WIN32 */
  2766. +#endif /* !_WINTIRPC */
  2767.  #include <errno.h>
  2768.  #include <fcntl.h>
  2769.  #include <stdio.h>
  2770.  #include <stdlib.h>
  2771.  #include <string.h>
  2772. -#ifndef _WIN32
  2773. +#ifndef _WINTIRPC
  2774.  #include <unistd.h>
  2775. -#endif /* !_WIN32 */
  2776. +#endif /* !_WINTIRPC */
  2777.  
  2778.  #include <rpc/rpc.h>
  2779.  
  2780. @@ -315,7 +315,7 @@ rendezvous_request(
  2781.         struct rpc_msg *msg)
  2782.  {
  2783.         int sock;
  2784. -#ifndef _WIN32
  2785. +#ifndef _WINTIRPC
  2786.         int flags;
  2787.  #endif
  2788.         struct cf_rendezvous *r;
  2789. @@ -373,7 +373,7 @@ again:
  2790.         cd->sendsize = r->sendsize;
  2791.         cd->maxrec = r->maxrec;
  2792.  
  2793. -#ifndef _WIN32
  2794. +#ifndef _WINTIRPC
  2795.         if (cd->maxrec != 0) {
  2796.                 flags = fcntl(sock, F_GETFL, 0);
  2797.                 if (flags  == -1)
  2798. @@ -386,7 +386,7 @@ again:
  2799.                 __xdrrec_setnonblock(&cd->xdrs, cd->maxrec);
  2800.         } else
  2801.                 cd->nonblock = FALSE;
  2802. -#endif /* _WIN32 */
  2803. +#endif /* _WINTIRPC */
  2804.  
  2805.         gettimeofday(&cd->last_recv_time, NULL);
  2806.  
  2807. @@ -502,7 +502,7 @@ read_vc(
  2808.         cfp = (struct cf_conn *)xprt->xp_p1;
  2809.  
  2810.         if (cfp->nonblock) {
  2811. -#ifdef _WIN32
  2812. +#ifdef _WINTIRPC
  2813.                 len = (int)wintirpc_recv(sock, buf, (size_t)len, 0);
  2814.  #else
  2815.                 len = read(sock, buf, (size_t)len);
  2816. @@ -519,7 +519,7 @@ read_vc(
  2817.         }
  2818.  
  2819.         do {
  2820. -#ifdef _WIN32
  2821. +#ifdef _WINTIRPC
  2822.                 pollfd.fd = wintirpc_fd2sockethandle(sock);
  2823.  #else
  2824.                 pollfd.fd = sock;
  2825. @@ -539,7 +539,7 @@ read_vc(
  2826.                 }
  2827.         } while ((pollfd.revents & POLLIN) == 0);
  2828.  
  2829. -#ifdef _WIN32
  2830. +#ifdef _WINTIRPC
  2831.         if ((len = (int)wintirpc_recv(sock, buf, (size_t)len, 0)) > 0) {
  2832.  #else
  2833.         if ((len = read(sock, buf, (size_t)len)) > 0) {
  2834. @@ -579,7 +579,7 @@ write_vc(
  2835.                 gettimeofday(&tv0, NULL);
  2836.        
  2837.         for (cnt = len; cnt > 0; cnt -= i, buf += i) {
  2838. -#ifdef _WIN32
  2839. +#ifdef _WINTIRPC
  2840.                 i = (int)wintirpc_send(xprt->xp_fd, buf, (size_t)cnt, 0);
  2841.  #else
  2842.                 i = write(xprt->xp_fd, buf, (size_t)cnt);
  2843. @@ -778,7 +778,7 @@ __rpc_get_local_uid(SVCXPRT *transp, uid_t *uid) {
  2844.                 return (-1);
  2845.  }
  2846.  
  2847. -#ifdef _WIN32
  2848. +#ifdef _WINTIRPC
  2849.  void timersub( const struct timeval *tvp, const struct timeval *uvp, struct timeval *vvp )
  2850.  {
  2851.      vvp->tv_sec = tvp->tv_sec - uvp->tv_sec;
  2852. diff --git a/libtirpc/src/xdr.c b/libtirpc/src/xdr.c
  2853. index 464ff71..0bf266b 100644
  2854. --- a/libtirpc/src/xdr.c
  2855. +++ b/libtirpc/src/xdr.c
  2856. @@ -38,9 +38,9 @@
  2857.   */
  2858.  
  2859.  #include <wintirpc.h>
  2860. -#ifndef _WIN32
  2861. +#ifndef _WINTIRPC
  2862.  #include <err.h>
  2863. -#endif /* !_WIN32 */
  2864. +#endif /* !_WINTIRPC */
  2865.  #include <stdio.h>
  2866.  #include <stdlib.h>
  2867.  #include <string.h>
  2868. @@ -553,13 +553,13 @@ xdr_enum(
  2869.  {
  2870.         enum sizecheck { SIZEVAL };     /* used to find the size of an enum */
  2871.  
  2872. -#ifdef _WIN32
  2873. +#ifdef _WINTIRPC
  2874.  #pragma warning( push )
  2875.  /*
  2876.   * warning C4127: conditional expression is constant
  2877.   */
  2878.  #pragma warning (disable : 4127)
  2879. -#endif /* _WIN32 */
  2880. +#endif /* _WINTIRPC */
  2881.         /*
  2882.          * enums are treated as ints
  2883.          */
  2884. @@ -572,9 +572,9 @@ xdr_enum(
  2885.         } else {
  2886.                 return (FALSE);
  2887.         }
  2888. -#ifdef _WIN32
  2889. +#ifdef _WINTIRPC
  2890.  #pragma warning( pop )
  2891. -#endif /* _WIN32 */
  2892. +#endif /* _WINTIRPC */
  2893.  }
  2894.  
  2895.  /*
  2896. diff --git a/libtirpc/src/xdr_array.c b/libtirpc/src/xdr_array.c
  2897. index b78be10..060314e 100644
  2898. --- a/libtirpc/src/xdr_array.c
  2899. +++ b/libtirpc/src/xdr_array.c
  2900. @@ -27,9 +27,9 @@
  2901.   * POSSIBILITY OF SUCH DAMAGE.
  2902.   */
  2903.  
  2904. -#ifndef _WIN32
  2905. +#ifndef _WINTIRPC
  2906.  #include <sys/cdefs.h>
  2907. -#endif /* !_WIN32 */
  2908. +#endif /* !_WINTIRPC */
  2909.  
  2910.  /*
  2911.   * xdr_array.c, Generic XDR routines impelmentation.
  2912. @@ -42,10 +42,10 @@
  2913.  
  2914.  #include <wintirpc.h>
  2915.  #include "namespace.h"
  2916. -#ifndef _WIN32
  2917. +#ifndef _WINTIRPC
  2918.  #include <err.h>
  2919.  #include <limits.h>
  2920. -#endif /* !_WIN32 */
  2921. +#endif /* !_WINTIRPC */
  2922.  #include <stdio.h>
  2923.  #include <stdlib.h>
  2924.  #include <string.h>
  2925. diff --git a/libtirpc/src/xdr_float.c b/libtirpc/src/xdr_float.c
  2926. index 6410b22..1967539 100644
  2927. --- a/libtirpc/src/xdr_float.c
  2928. +++ b/libtirpc/src/xdr_float.c
  2929. @@ -27,9 +27,9 @@
  2930.   * POSSIBILITY OF SUCH DAMAGE.
  2931.   */
  2932.  
  2933. -#ifndef _WIN32
  2934. +#ifndef _WINTIRPC
  2935.  #include <sys/cdefs.h>
  2936. -#endif /* !_WIN32 */
  2937. +#endif /* !_WINTIRPC */
  2938.  
  2939.  /*
  2940.   * xdr_float.c, Generic XDR routines implementation.
  2941. @@ -44,9 +44,9 @@
  2942.  #include <wintirpc.h>
  2943.  #include "namespace.h"
  2944.  #include <sys/types.h>
  2945. -#ifndef _WIN32
  2946. +#ifndef _WINTIRPC
  2947.  #include <sys/param.h>
  2948. -#endif /* !_WIN32 */
  2949. +#endif /* !_WINTIRPC */
  2950.  
  2951.  #include <stdio.h>
  2952.  
  2953. diff --git a/libtirpc/src/xdr_mem.c b/libtirpc/src/xdr_mem.c
  2954. index 4553c41..082cf81 100644
  2955. --- a/libtirpc/src/xdr_mem.c
  2956. +++ b/libtirpc/src/xdr_mem.c
  2957. @@ -26,9 +26,9 @@
  2958.   * POSSIBILITY OF SUCH DAMAGE.
  2959.   */
  2960.  
  2961. -#ifndef _WIN32
  2962. +#ifndef _WINTIRPC
  2963.  #include <sys/cdefs.h>
  2964. -#endif /* !_WIN32 */
  2965. +#endif /* !_WINTIRPC */
  2966.  
  2967.  /*
  2968.   * xdr_mem.h, XDR implementation using memory buffers.
  2969. @@ -45,9 +45,9 @@
  2970.  #include "namespace.h"
  2971.  #include <sys/types.h>
  2972.  
  2973. -#ifndef _WIN32
  2974. +#ifndef _WINTIRPC
  2975.  #include <netinet/in.h>
  2976. -#endif /* !_WIN32 */
  2977. +#endif /* !_WINTIRPC */
  2978.  
  2979.  #include <string.h>
  2980.  
  2981. diff --git a/libtirpc/src/xdr_rec.c b/libtirpc/src/xdr_rec.c
  2982. index 6ff721f..f2730ab 100644
  2983. --- a/libtirpc/src/xdr_rec.c
  2984. +++ b/libtirpc/src/xdr_rec.c
  2985. @@ -26,10 +26,10 @@
  2986.   * POSSIBILITY OF SUCH DAMAGE.
  2987.   */
  2988.  
  2989. -#ifndef _WIN32
  2990. +#ifndef _WINTIRPC
  2991.  #include <sys/cdefs.h>
  2992.  #include <sys/cdefs.h>
  2993. -#endif /* !_WIN32 */
  2994. +#endif /* !_WINTIRPC */
  2995.  
  2996.  /*
  2997.   * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
  2998. @@ -75,13 +75,13 @@
  2999.  #include <io.h>
  3000.  #include <sys/types.h>
  3001.  
  3002. -#ifndef _WIN32
  3003. +#ifndef _WINTIRPC
  3004.  #include <netinet/in.h>
  3005. -#endif /* !_WIN32 */
  3006. +#endif /* !_WINTIRPC */
  3007.  
  3008. -#ifndef _WIN32
  3009. +#ifndef _WINTIRPC
  3010.  #include <err.h>
  3011. -#endif /* !_WIN32 */
  3012. +#endif /* !_WINTIRPC */
  3013.  #include <stdio.h>
  3014.  #include <stdlib.h>
  3015.  #include <string.h>
  3016. @@ -94,9 +94,9 @@
  3017.  #include <rpc/clnt.h>
  3018.  #include <stddef.h>
  3019.  #include "rpc_com.h"
  3020. -#ifndef _WIN32
  3021. +#ifndef _WINTIRPC
  3022.  #include <unistd.h>
  3023. -#endif /* !_WIN32 */
  3024. +#endif /* !_WINTIRPC */
  3025.  static bool_t  xdrrec_getlong(XDR *, long *);
  3026.  static bool_t  xdrrec_putlong(XDR *, const long *);
  3027.  static bool_t  xdrrec_getbytes(XDR *, char *, u_int);
  3028. diff --git a/libtirpc/src/xdr_reference.c b/libtirpc/src/xdr_reference.c
  3029. index 00dd283..1cf0b59 100644
  3030. --- a/libtirpc/src/xdr_reference.c
  3031. +++ b/libtirpc/src/xdr_reference.c
  3032. @@ -26,10 +26,10 @@
  3033.   * POSSIBILITY OF SUCH DAMAGE.
  3034.   */
  3035.  
  3036. -#ifndef _WIN32
  3037. +#ifndef _WINTIRPC
  3038.  #include <sys/cdefs.h>
  3039.  #include <sys/cdefs.h>
  3040. -#endif /* !_WIN32 */
  3041. +#endif /* !_WINTIRPC */
  3042.  
  3043.  /*
  3044.   * xdr_reference.c, Generic XDR routines impelmentation.
  3045. @@ -42,9 +42,9 @@
  3046.  
  3047.  #include <wintirpc.h>
  3048.  #include "namespace.h"
  3049. -#ifndef _WIN32
  3050. +#ifndef _WINTIRPC
  3051.  #include <err.h>
  3052. -#endif /* !_WIN32 */
  3053. +#endif /* !_WINTIRPC */
  3054.  #include <stdio.h>
  3055.  #include <stdlib.h>
  3056.  #include <string.h>
  3057. diff --git a/libtirpc/src/xdr_sizeof.c b/libtirpc/src/xdr_sizeof.c
  3058. index 1ad25fc..c52bf54 100644
  3059. --- a/libtirpc/src/xdr_sizeof.c
  3060. +++ b/libtirpc/src/xdr_sizeof.c
  3061. @@ -34,9 +34,9 @@
  3062.   * when serialized using XDR.
  3063.   */
  3064.  
  3065. -#ifndef _WIN32
  3066. +#ifndef _WINTIRPC
  3067.  #include <sys/cdefs.h>
  3068. -#endif /* !_WIN32 */
  3069. +#endif /* !_WINTIRPC */
  3070.  
  3071.  #include <wintirpc.h>
  3072.  #include "namespace.h"
  3073. diff --git a/libtirpc/src/xdr_stdio.c b/libtirpc/src/xdr_stdio.c
  3074. index 1da79a8..7e1744c 100644
  3075. --- a/libtirpc/src/xdr_stdio.c
  3076. +++ b/libtirpc/src/xdr_stdio.c
  3077. @@ -26,9 +26,9 @@
  3078.   * POSSIBILITY OF SUCH DAMAGE.
  3079.   */
  3080.  
  3081. -#ifndef _WIN32
  3082. +#ifndef _WINTIRPC
  3083.  #include <sys/cdefs.h>
  3084. -#endif /* !_WIN32 */
  3085. +#endif /* !_WINTIRPC */
  3086.  
  3087.  /*
  3088.   * xdr_stdio.c, XDR implementation on standard i/o file.
  3089. @@ -44,9 +44,9 @@
  3090.  #include "namespace.h"
  3091.  #include <stdio.h>
  3092.  
  3093. -#ifndef _WIN32
  3094. +#ifndef _WINTIRPC
  3095.  #include <arpa/inet.h>
  3096. -#endif /* !_WIN32 */
  3097. +#endif /* !_WINTIRPC */
  3098.  #include <rpc/types.h>
  3099.  #include <rpc/xdr.h>
  3100.  #include "un-namespace.h"
  3101. diff --git a/libtirpc/tirpc/misc/event.h b/libtirpc/tirpc/misc/event.h
  3102. index 7875ca8..6c48551 100644
  3103. --- a/libtirpc/tirpc/misc/event.h
  3104. +++ b/libtirpc/tirpc/misc/event.h
  3105. @@ -186,9 +186,9 @@ extern int  kqueue_del_filteropts(int filt);
  3106.  
  3107.  #else  /* !_KERNEL */
  3108.  
  3109. -#ifndef _WIN32
  3110. +#ifndef _WINTIRPC
  3111.  #include <sys/cdefs.h>
  3112. -#endif /* !_WIN32 */
  3113. +#endif /* !_WINTIRPC */
  3114.  struct timespec;
  3115.  
  3116.  __BEGIN_DECLS
  3117. diff --git a/libtirpc/tirpc/netconfig.h b/libtirpc/tirpc/netconfig.h
  3118. index 6ebb70d..7b71bee 100644
  3119. --- a/libtirpc/tirpc/netconfig.h
  3120. +++ b/libtirpc/tirpc/netconfig.h
  3121. @@ -1,9 +1,9 @@
  3122.  #ifndef _NETCONFIG_H_
  3123.  #define _NETCONFIG_H_
  3124.  
  3125. -#ifndef _WIN32
  3126. +#ifndef _WINTIRPC
  3127.  #include <features.h>
  3128. -#endif /* !_WIN32 */
  3129. +#endif /* !_WINTIRPC */
  3130.  
  3131.  /* XXX Should be in, or come from, the registry!!! */
  3132.  #define NETCONFIG "c:\\etc\\netconfig"
  3133. diff --git a/libtirpc/tirpc/reentrant.h b/libtirpc/tirpc/reentrant.h
  3134. index 7f130ae..9e6b102 100644
  3135. --- a/libtirpc/tirpc/reentrant.h
  3136. +++ b/libtirpc/tirpc/reentrant.h
  3137. @@ -112,9 +112,9 @@
  3138.  
  3139.  #ifndef _REENTRANT_H
  3140.  #define _REENTRANT_H
  3141. -#ifndef _WIN32
  3142. +#ifndef _WINTIRPC
  3143.  #include <pthread.h>
  3144. -#endif /* !_WIN32 */
  3145. +#endif /* !_WINTIRPC */
  3146.  #include <libc_private.h>
  3147.  
  3148.  #include <stdlib.h>
  3149. diff --git a/libtirpc/tirpc/rpc/auth.h b/libtirpc/tirpc/rpc/auth.h
  3150. index 108141e..95349f8 100644
  3151. --- a/libtirpc/tirpc/rpc/auth.h
  3152. +++ b/libtirpc/tirpc/rpc/auth.h
  3153. @@ -71,10 +71,10 @@
  3154.  
  3155.  #include <rpc/xdr.h>
  3156.  #include <rpc/clnt_stat.h>
  3157. -#ifndef _WIN32
  3158. +#ifndef _WINTIRPC
  3159.  #include <sys/cdefs.h>
  3160.  #include <sys/socket.h>
  3161. -#endif /* !_WIN32 */
  3162. +#endif /* !_WINTIRPC */
  3163.  #include <sys/types.h>
  3164.  
  3165.  
  3166. diff --git a/libtirpc/tirpc/rpc/auth_des.h b/libtirpc/tirpc/rpc/auth_des.h
  3167. index d940010..42a0dc0 100644
  3168. --- a/libtirpc/tirpc/rpc/auth_des.h
  3169. +++ b/libtirpc/tirpc/rpc/auth_des.h
  3170. @@ -121,7 +121,7 @@ __END_DECLS
  3171.  __BEGIN_DECLS
  3172.  extern bool_t  xdr_authdes_cred(XDR *, struct authdes_cred *);
  3173.  extern bool_t  xdr_authdes_verf(XDR *, struct authdes_verf *);
  3174. -#ifndef _WIN32
  3175. +#ifndef _WINTIRPC
  3176.  extern int     rtime(dev_t, struct netbuf *, int, struct timeval *,
  3177.                     struct timeval *);
  3178.  #else
  3179. diff --git a/libtirpc/tirpc/rpc/auth_sspi.h b/libtirpc/tirpc/rpc/auth_sspi.h
  3180. index ccb75ba..fbcade6 100644
  3181. --- a/libtirpc/tirpc/rpc/auth_sspi.h
  3182. +++ b/libtirpc/tirpc/rpc/auth_sspi.h
  3183. @@ -1,8 +1,10 @@
  3184.  /* NFSv4.1 client for Windows
  3185. - * Copyright (C) 2012 The Regents of the University of Michigan
  3186. + * Copyright (C) 2012 The Regents of the University of Michigan
  3187. + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org>
  3188.   *
  3189.   * Olga Kornievskaia <aglo@umich.edu>
  3190.   * Casey Bodley <cbodley@umich.edu>
  3191. + * Roland Mainz <roland.mainz@nrubsig.org>
  3192.   *
  3193.   * This library is free software; you can redistribute it and/or modify it
  3194.   * under the terms of the GNU Lesser General Public License as published by
  3195. diff --git a/libtirpc/tirpc/rpc/auth_unix.h b/libtirpc/tirpc/rpc/auth_unix.h
  3196. index 9d9f059..64b8696 100644
  3197. --- a/libtirpc/tirpc/rpc/auth_unix.h
  3198. +++ b/libtirpc/tirpc/rpc/auth_unix.h
  3199. @@ -45,9 +45,9 @@
  3200.  
  3201.  #ifndef _TIRPC_AUTH_UNIX_H
  3202.  #define _TIRPC_AUTH_UNIX_H
  3203. -#ifndef _WIN32
  3204. +#ifndef _WINTIRPC
  3205.  #include <sys/cdefs.h>
  3206. -#endif /* !_WIN32 */
  3207. +#endif /* !_WINTIRPC */
  3208.  
  3209.  /* The machine name is part of a credential; it may not exceed 255 bytes */
  3210.  #define MAX_MACHINE_NAME 255
  3211. diff --git a/libtirpc/tirpc/rpc/clnt.h b/libtirpc/tirpc/rpc/clnt.h
  3212. index 20b599d..704d3f4 100644
  3213. --- a/libtirpc/tirpc/rpc/clnt.h
  3214. +++ b/libtirpc/tirpc/rpc/clnt.h
  3215. @@ -65,17 +65,17 @@
  3216.  #ifndef _TIRPC_CLNT_H_
  3217.  #define _TIRPC_CLNT_H_
  3218.  
  3219. -#ifndef _WIN32
  3220. +#ifndef _WINTIRPC
  3221.  #include <rpc/clnt_stat.h>
  3222. -#endif /* !_WIN32 */
  3223. +#endif /* !_WINTIRPC */
  3224.  #include "clnt_stat.h"
  3225.  #include <rpc/auth.h>
  3226.  
  3227. -#ifndef _WIN32
  3228. +#ifndef _WINTIRPC
  3229.  #include <sys/cdefs.h>
  3230.  #include <netconfig.h>
  3231.  #include <sys/un.h>
  3232. -#endif /* !_WIN32 */
  3233. +#endif /* !_WINTIRPC */
  3234.  
  3235.  /*
  3236.   * Well-known IPV6 RPC broadcast address.
  3237. diff --git a/libtirpc/tirpc/rpc/clnt_soc.h b/libtirpc/tirpc/rpc/clnt_soc.h
  3238. index 172ef61..66a6b42 100644
  3239. --- a/libtirpc/tirpc/rpc/clnt_soc.h
  3240. +++ b/libtirpc/tirpc/rpc/clnt_soc.h
  3241. @@ -46,9 +46,9 @@
  3242.   * with TS-RPC.
  3243.   */
  3244.  
  3245. -#ifndef _WIN32
  3246. +#ifndef _WINTIRPC
  3247.  #include <sys/cdefs.h>
  3248. -#endif /* !_WIN32 */
  3249. +#endif /* !_WINTIRPC */
  3250.  
  3251.  #define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */  
  3252.  
  3253. diff --git a/libtirpc/tirpc/rpc/des_crypt.h b/libtirpc/tirpc/rpc/des_crypt.h
  3254. index d7be062..cc394ae 100644
  3255. --- a/libtirpc/tirpc/rpc/des_crypt.h
  3256. +++ b/libtirpc/tirpc/rpc/des_crypt.h
  3257. @@ -43,9 +43,9 @@
  3258.  #ifndef _DES_DES_CRYPT_H
  3259.  #define _DES_DES_CRYPT_H
  3260.  
  3261. -#ifndef _WIN32
  3262. +#ifndef _WINTIRPC
  3263.  #include <sys/cdefs.h>
  3264. -#endif /* !_WIN32 */
  3265. +#endif /* !_WINTIRPC */
  3266.  #include <rpc/rpc.h>
  3267.  
  3268.  #define DES_MAXDATA 8192       /* max bytes encrypted in one call */
  3269. diff --git a/libtirpc/tirpc/rpc/pmap_clnt.h b/libtirpc/tirpc/rpc/pmap_clnt.h
  3270. index 9df2e44..ed61716 100644
  3271. --- a/libtirpc/tirpc/rpc/pmap_clnt.h
  3272. +++ b/libtirpc/tirpc/rpc/pmap_clnt.h
  3273. @@ -63,9 +63,9 @@
  3274.  
  3275.  #ifndef _RPC_PMAP_CLNT_H_
  3276.  #define _RPC_PMAP_CLNT_H_
  3277. -#ifndef _WIN32
  3278. +#ifndef _WINTIRPC
  3279.  #include <sys/cdefs.h>
  3280. -#endif /* !_WIN32 */
  3281. +#endif /* !_WINTIRPC */
  3282.  
  3283.  __BEGIN_DECLS
  3284.  extern bool_t          pmap_set(u_long, u_long, int, int);
  3285. diff --git a/libtirpc/tirpc/rpc/pmap_prot.h b/libtirpc/tirpc/rpc/pmap_prot.h
  3286. index 3389b51..0fb33ca 100644
  3287. --- a/libtirpc/tirpc/rpc/pmap_prot.h
  3288. +++ b/libtirpc/tirpc/rpc/pmap_prot.h
  3289. @@ -72,9 +72,9 @@
  3290.  #ifndef _RPC_PMAP_PROT_H
  3291.  #define _RPC_PMAP_PROT_H
  3292.  
  3293. -#ifndef _WIN32
  3294. +#ifndef _WINTIRPC
  3295.  #include <sys/cdefs.h>
  3296. -#endif /* !_WIN32 */
  3297. +#endif /* !_WINTIRPC */
  3298.  
  3299.  #define PMAPPORT               ((u_short)111)
  3300.  #define PMAPPROG               ((u_long)100000)
  3301. diff --git a/libtirpc/tirpc/rpc/pmap_rmt.h b/libtirpc/tirpc/rpc/pmap_rmt.h
  3302. index 02b4ba3..3c0788a 100644
  3303. --- a/libtirpc/tirpc/rpc/pmap_rmt.h
  3304. +++ b/libtirpc/tirpc/rpc/pmap_rmt.h
  3305. @@ -41,9 +41,9 @@
  3306.  
  3307.  #ifndef _RPC_PMAP_RMT_H
  3308.  #define _RPC_PMAP_RMT_H
  3309. -#ifndef _WIN32
  3310. +#ifndef _WINTIRPC
  3311.  #include <sys/cdefs.h>
  3312. -#endif /* !_WIN32 */
  3313. +#endif /* !_WINTIRPC */
  3314.  
  3315.  struct rmtcallargs {
  3316.         u_long prog, vers, proc, arglen;
  3317. diff --git a/libtirpc/tirpc/rpc/rpc.h b/libtirpc/tirpc/rpc/rpc.h
  3318. index 6759fc5..2161af9 100644
  3319. --- a/libtirpc/tirpc/rpc/rpc.h
  3320. +++ b/libtirpc/tirpc/rpc/rpc.h
  3321. @@ -37,10 +37,10 @@
  3322.  
  3323.  #include <rpc/types.h>         /* some typedefs */
  3324.  #include "winsock2.h"
  3325. -#ifndef _WIN32
  3326. +#ifndef _WINTIRPC
  3327.  #include <sys/socket.h>
  3328.  #include <netinet/in.h>
  3329. -#endif /* !_WIN32 */
  3330. +#endif /* !_WINTIRPC */
  3331.  
  3332.  /* external data representation interfaces */
  3333.  #include <rpc/xdr.h>           /* generic (de)serializer */
  3334. diff --git a/libtirpc/tirpc/rpc/rpc_com.h b/libtirpc/tirpc/rpc/rpc_com.h
  3335. index 37f36a5..4f98416 100644
  3336. --- a/libtirpc/tirpc/rpc/rpc_com.h
  3337. +++ b/libtirpc/tirpc/rpc/rpc_com.h
  3338. @@ -41,9 +41,9 @@
  3339.  #ifndef _RPC_RPCCOM_H
  3340.  #define        _RPC_RPCCOM_H
  3341.  
  3342. -#ifndef _WIN32
  3343. +#ifndef _WINTIRPC
  3344.  #include <sys/cdefs.h>
  3345. -#endif /* !_WIN32 */
  3346. +#endif /* !_WINTIRPC */
  3347.  
  3348.  /* #pragma ident       "@(#)rpc_com.h  1.11    93/07/05 SMI" */
  3349.  
  3350. @@ -54,7 +54,7 @@
  3351.  #define        RPC_MAXDATASIZE 9000
  3352.  #define        RPC_MAXADDRSIZE 1024
  3353.  
  3354. -//#ifdef _WIN32
  3355. +//#ifdef _WINTIRPC
  3356.  //#define __RPC_GETXID(now) ((u_int32_t)_getpid() ^ (u_int32_t)(now)->tv_sec ^ \
  3357.  //    (u_int32_t)(now)->tv_usec)
  3358.  //#else
  3359. diff --git a/libtirpc/tirpc/rpc/svc.h b/libtirpc/tirpc/rpc/svc.h
  3360. index b523d3b..15d9819 100644
  3361. --- a/libtirpc/tirpc/rpc/svc.h
  3362. +++ b/libtirpc/tirpc/rpc/svc.h
  3363. @@ -40,9 +40,9 @@
  3364.  
  3365.  #ifndef _TIRPC_SVC_H
  3366.  #define _TIRPC_SVC_H
  3367. -#ifndef _WIN32
  3368. +#ifndef _WINTIRPC
  3369.  #include <sys/cdefs.h>
  3370. -#endif /* !_WIN32 */
  3371. +#endif /* !_WINTIRPC */
  3372.  
  3373.  /*
  3374.   * This interface must manage two items concerning remote procedure calling:
  3375. diff --git a/libtirpc/tirpc/rpc/svc_soc.h b/libtirpc/tirpc/rpc/svc_soc.h
  3376. index 2bbfddb..898e6c6 100644
  3377. --- a/libtirpc/tirpc/rpc/svc_soc.h
  3378. +++ b/libtirpc/tirpc/rpc/svc_soc.h
  3379. @@ -38,9 +38,9 @@
  3380.  
  3381.  #ifndef _RPC_SVC_SOC_H
  3382.  #define _RPC_SVC_SOC_H
  3383. -#ifndef _WIN32
  3384. +#ifndef _WINTIRPC
  3385.  #include <sys/cdefs.h>
  3386. -#endif /* !_WIN32 */
  3387. +#endif /* !_WINTIRPC */
  3388.  
  3389.  /* #pragma ident   "@(#)svc_soc.h  1.11    94/04/25 SMI" */
  3390.  /*      svc_soc.h 1.8 89/05/01 SMI      */
  3391. diff --git a/libtirpc/tirpc/rpc/types.h b/libtirpc/tirpc/rpc/types.h
  3392. index 3bdfb93..a3dcec6 100644
  3393. --- a/libtirpc/tirpc/rpc/types.h
  3394. +++ b/libtirpc/tirpc/rpc/types.h
  3395. @@ -62,11 +62,11 @@
  3396.  #define _TIRPC_TYPES_H
  3397.  
  3398.  #include <sys/types.h>
  3399. -#ifndef _WIN32
  3400. +#ifndef _WINTIRPC
  3401.  #include <sys/_null.h>
  3402. -#endif /* !_WIN32 */
  3403. +#endif /* !_WINTIRPC */
  3404.  
  3405. -#ifdef _WIN32
  3406. +#ifdef _WINTIRPC
  3407.  /*
  3408.   * Windows mappings of data types
  3409.   * Fixed size things
  3410. @@ -101,7 +101,7 @@ typedef DWORD    pid_t;
  3411.  typedef SIZE_T  size_t;  /* This is causing a "benign redefinition error" */
  3412.  #endif
  3413.  typedef SSIZE_T ssize_t;
  3414. -#endif /* _WIN32 */
  3415. +#endif /* _WINTIRPC */
  3416.  
  3417.  typedef int32_t bool_t;
  3418.  typedef int32_t enum_t;
  3419. @@ -128,10 +128,10 @@ typedef   int32_t rpc_inline_t;
  3420.  #define mem_alloc(bsize)       calloc(1, bsize)
  3421.  #define mem_free(ptr, bsize)   free(ptr)
  3422.  
  3423. -#ifndef _WIN32
  3424. +#ifndef _WINTIRPC
  3425.  #include <sys/time.h>
  3426.  #include <sys/param.h>
  3427. -#endif /* !_WIN32 */
  3428. +#endif /* !_WINTIRPC */
  3429.  #include <stdlib.h>
  3430.  #include <netconfig.h>
  3431.  
  3432. diff --git a/libtirpc/tirpc/rpc/xdr.h b/libtirpc/tirpc/rpc/xdr.h
  3433. index be14dd6..c42f299 100644
  3434. --- a/libtirpc/tirpc/rpc/xdr.h
  3435. +++ b/libtirpc/tirpc/rpc/xdr.h
  3436. @@ -40,13 +40,13 @@
  3437.  
  3438.  #ifndef _TIRPC_XDR_H
  3439.  #define _TIRPC_XDR_H
  3440. -#ifndef _WIN32
  3441. +#ifndef _WINTIRPC
  3442.  #include <sys/cdefs.h>
  3443. -#endif /* !_WIN32 */
  3444. +#endif /* !_WINTIRPC */
  3445.  #include <stdio.h>
  3446. -#ifndef _WIN32
  3447. +#ifndef _WINTIRPC
  3448.  #include <netinet/in.h>
  3449. -#endif /* !_WIN32 */
  3450. +#endif /* !_WINTIRPC */
  3451.  /* Rajout pour la definition des types */
  3452.  #include <rpc/types.h>
  3453.  
  3454. diff --git a/libtirpc/tirpc/spinlock.h b/libtirpc/tirpc/spinlock.h
  3455. index 31a9103..818920d 100644
  3456. --- a/libtirpc/tirpc/spinlock.h
  3457. +++ b/libtirpc/tirpc/spinlock.h
  3458. @@ -37,9 +37,9 @@
  3459.  
  3460.  #ifndef _SPINLOCK_H_
  3461.  #define _SPINLOCK_H_
  3462. -#ifndef _WIN32
  3463. +#ifndef _WINTIRPC
  3464.  #include <sys/cdefs.h>
  3465. -#endif /* !_WIN32 */
  3466. +#endif /* !_WINTIRPC */
  3467.  #include <sys/types.h>
  3468.  
  3469.  /*
  3470. diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h
  3471. index 1649764..347d572 100644
  3472. --- a/libtirpc/tirpc/wintirpc.h
  3473. +++ b/libtirpc/tirpc/wintirpc.h
  3474. @@ -1,5 +1,6 @@
  3475.  /* NFSv4.1 client for Windows
  3476. - * Copyright (C) 2012 The Regents of the University of Michigan
  3477. + * Copyright (C) 2012 The Regents of the University of Michigan
  3478. + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org>
  3479.   *
  3480.   * Olga Kornievskaia <aglo@umich.edu>
  3481.   * Casey Bodley <cbodley@umich.edu>
  3482. @@ -117,6 +118,10 @@ struct timezone
  3483.  extern int gettimeofday(struct timeval *tv, struct timezone *tz);
  3484.  extern int asprintf(char **str, const char *fmt, ...);
  3485.  
  3486. +#ifndef _WIN32_WINNT
  3487. +#error _WIN32_WINNT not defined
  3488. +#endif /* !_WIN32_WINNT */
  3489. +
  3490.  #if(_WIN32_WINNT < 0x0501)
  3491.  #define SOL_IPV6 IPPROTO_IPV6
  3492.  #endif
  3493. --
  3494. 2.45.4
  3495.  
  3496. From 9d81d5a81556ee6f3c11179c7be147602a1fcb8e Mon Sep 17 00:00:00 2001
  3497. From: Roland Mainz <roland.mainz@nrubsig.org>
  3498. Date: Wed, 3 Sep 2025 15:09:13 +0200
  3499. Subject: [PATCH 5/5] README.md,docs: Document NFS server requirements for NFS
  3500.  Named Attributes
  3501.  
  3502. Document NFS server requirements for NFS Named Attributes (e.g.
  3503. |O_XATTR|/|O_NAMEDATTR|).
  3504.  
  3505. Reported-by: Cedric Blancher <cedric.blancher@gmail.com>
  3506. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  3507. ---
  3508. README.md       | 3 ++-
  3509.  docs/README.xml | 2 +-
  3510.  2 files changed, 3 insertions(+), 2 deletions(-)
  3511.  
  3512. diff --git a/README.md b/README.md
  3513. index a9bb25c..519f1f0 100644
  3514. --- a/README.md
  3515. +++ b/README.md
  3516. @@ -841,7 +841,8 @@ Within WSL mount UNC path returned by `/sbin/nfs_mount`
  3517.  
  3518.  - Extended attributes are supported with some limitations:
  3519.  
  3520. -  - a\) the server must support NFS Named Attributes,
  3521. +  - a\) the server must support NFS Named Attributes (e.g. Solaris,
  3522. +    Illumos, FreeBSD 15, but NOT Linux nfsd),
  3523.  
  3524.    - b\) the order of listings cannot be guaranteed by NFS, and
  3525.  
  3526. diff --git a/docs/README.xml b/docs/README.xml
  3527. index e32fda4..4f290a3 100644
  3528. --- a/docs/README.xml
  3529. +++ b/docs/README.xml
  3530. @@ -824,7 +824,7 @@ A::EVERYONE@:rtcy</programlisting>
  3531.        <listitem>
  3532.          <para>Extended attributes are supported with some limitations:
  3533.            <itemizedlist>
  3534. -            <listitem><para>a) the server must support NFS Named Attributes,</para></listitem>
  3535. +            <listitem><para>a) the server must support NFS Named Attributes (e.g. Solaris, Illumos, FreeBSD 15, but NOT Linux nfsd),</para></listitem>
  3536.              <listitem><para>b) the order of listings cannot be guaranteed by NFS, and</para></listitem>
  3537.              <listitem><para>c) the EaSize field cannot be reported for directory queries of <literal>FileBothDirInformation</literal>, <literal>FileFullDirInfo</literal>, or <literal>FileIdFullDirInfo</literal>.</para></listitem>
  3538.            </itemizedlist>
  3539. --
  3540. 2.45.4

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at