From a8a0525464d9b71d251fd7261fb06c0451a74edf Mon Sep 17 00:00:00 2001
From: Phil Miller <mille121@illinois.edu>
Date: Wed, 8 Feb 2017 12:05:36 -0600
Subject: [PATCH] Bug #1388: Fix charmrun compilation issues on Windows

Change-Id: I94bb6f92fe7e6bd797147cee02a6fb874580f0d0
---
 src/util/charmrun-src/charmrun.C | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/util/charmrun-src/charmrun.C b/src/util/charmrun-src/charmrun.C
index 4fd712e187..db72fdd8e7 100644
--- a/src/util/charmrun-src/charmrun.C
+++ b/src/util/charmrun-src/charmrun.C
@@ -63,13 +63,6 @@
 
 #else /*Use SSH to start node-programs*/
 #define CMK_USE_SSH 1
-#ifdef __MINGW_H
-#include <rpc.h>
-#elif !defined(__CYGWIN__)
-#include <rpc/rpc.h>
-#else
-#include <w32api/rpc.h>
-#endif
 #if CMK_SSH_IS_A_COMMAND
 #define SSH_CMD "ssh"
 #endif
@@ -1017,9 +1010,12 @@ void arg_init(int argc, const char **argv)
       arg_shell = getenv_ssh();
   }
 
+#if !defined(_WIN32) || defined(__CYGWIN__)
   /* Find the current value of the DISPLAY variable */
   if (!arg_display)
     arg_display = getenv_display_no_tamper();
+#endif
+
   if ((arg_debug || arg_debug_no_pause || arg_in_xterm) && (arg_display == 0)) {
     fprintf(stderr, "ERROR> DISPLAY must be set to use debugging mode\n");
     exit(1);
-- 
2.11.4.GIT