more cygwin fixes

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1002 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/plugin_uname.c b/plugin_uname.c
index 77ac4ca19932b3f4d6d1c6e8ea4c669bf105b470..d2a561d3464b22a766b8ccb8ba0d70715aac056f 100644 (file)
--- a/plugin_uname.c
+++ b/plugin_uname.c
@@ -68,7 +68,7 @@ static void my_uname(RESULT * result, RESULT * arg1)
        value = utsbuf.version;
     } else if (strcasecmp(key, "machine") == 0) {
        value = utsbuf.machine;
-#if defined(_GNU_SOURCE) && ! defined(__APPLE__)
+#if defined(_GNU_SOURCE) && ! defined(__APPLE__) && ! defined(__CYGWIN__)
     } else if (strcasecmp(key, "domainname") == 0) {
        value = utsbuf.domainname;
 #endif

diff --git a/thread.h b/thread.h
index f902d7e60c58d27829b46739c31479c1a9f5b7b8..be1bcd56b642ce0192dca519a1c2fb213362db0b 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -30,7 +30,7 @@
 #ifndef _THREAD_H_
 #define _THREAD_H_
 
-#ifdef CYGWIN
+#ifdef __CYGWIN__
 
 #ifndef HAVE_UNION_SEMUN
 union semun