[PATCH 3/4] hw/xwin: fmemopen is available on cygwin but not MinGW

Jon TURNEY jon.turney at dronecode.org.uk
Tue Oct 23 08:11:45 PDT 2012


From: Colin Harrison <colin.harrison at virgin.net>

This is a follow-up to commit 0659437f5ec0e3f646373394f5f9c5461e2170f3.

Signed-off-by: Colin Harrison <colin.harrison at virgin.net>
Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 hw/xwin/winprefs.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index faa97c3..7722c82 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -648,6 +648,7 @@ winPrefsLoadPreferences(char *path)
 
     if (path)
         prefFile = fopen(path, "r");
+#ifdef __CYGWIN__
     else {
         char defaultPrefs[] =
             "MENU rmenu {\n"
@@ -659,6 +660,7 @@ winPrefsLoadPreferences(char *path)
         path = "built-in default";
         prefFile = fmemopen(defaultPrefs, strlen(defaultPrefs), "r");
     }
+#endif
 
     if (!prefFile) {
         ErrorF("LoadPreferences: %s not found\n", path);
-- 
1.7.9



More information about the xorg-devel mailing list