summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Harrison <colin.harrison@virgin.net>2012-02-18 20:37:19 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-10-29 12:22:07 +0000
commit74735c5ebff15db8891808068fe8569d8ccde9e7 (patch)
tree1fa65ab01ae35e02cfcccf687b51abf2705f52bf
parent748be9da20a8bf3dd99701a95eac7ee3895a28de (diff)
hw/xwin: fmemopen is available on cygwin but not MinGW
This is a follow-up to commit 0659437f5ec0e3f646373394f5f9c5461e2170f3. Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-rw-r--r--hw/xwin/winprefs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index dbc5b5228..6cbd7ad80 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -645,6 +645,7 @@ winPrefsLoadPreferences(char *path)
if (path)
prefFile = fopen(path, "r");
+#ifdef __CYGWIN__
else {
char defaultPrefs[] =
"MENU rmenu {\n"
@@ -656,6 +657,7 @@ winPrefsLoadPreferences(char *path)
path = "built-in default";
prefFile = fmemopen(defaultPrefs, strlen(defaultPrefs), "r");
}
+#endif
if (!prefFile) {
ErrorF("LoadPreferences: %s not found\n", path);