summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@wingomac.bcn.oblong.net>2010-10-18 13:35:46 +0200
committerAndy Wingo <wingo@wingomac.bcn.oblong.net>2010-10-18 13:35:46 +0200
commit534bbcc168e06f81a839dff743ba8180a763d53c (patch)
treea8ac2f255b26f6e42428f968022109785b106118
parentc1a0ba1cef7cf16d9efc230d4a3166abdef3f29e (diff)
downloadguile-534bbcc168e06f81a839dff743ba8180a763d53c.tar.gz
more -Wundef on darwin fixes
* libguile/threads.c: * libguile/posix.c: Change a couple #if HAVE_FOO to #ifdef HAVE_FOO to pacify -Wundef. Some vars are defined or not, whereas some are always defined to 0 or 1. The inconsistency is unfortunate.
-rw-r--r--libguile/posix.c6
-rw-r--r--libguile/threads.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/libguile/posix.c b/libguile/posix.c
index a28cfa3a0..f371cb23e 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -121,7 +121,7 @@ extern char *ttyname();
# include <xlocale.h>
#endif
-#if HAVE_CRYPT_H
+#ifdef HAVE_CRYPT_H
# include <crypt.h>
#endif
@@ -1755,7 +1755,7 @@ SCM_DEFINE (scm_sync, "sync", 0, 0, 0,
multiple cpus. So for now we don't bother with anything fancy, just
ensure it works. */
-#if HAVE_CRYPT
+#ifdef HAVE_CRYPT
SCM_DEFINE (scm_crypt, "crypt", 2, 0, 0,
(SCM key, SCM salt),
"Encrypt @var{key} using @var{salt} as the salt value to the\n"
@@ -1841,7 +1841,7 @@ SCM_DEFINE (scm_getlogin, "getlogin", 0, 0, 0,
#undef FUNC_NAME
#endif /* HAVE_GETLOGIN */
-#if HAVE_CUSERID
+#ifdef HAVE_CUSERID
# if !HAVE_DECL_CUSERID
extern char *cuserid (char *);
diff --git a/libguile/threads.c b/libguile/threads.c
index 8249ebf90..6bc53a80e 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -630,7 +630,7 @@ scm_i_init_thread_for_guile (SCM_STACKITEM *base, SCM parent)
#if SCM_USE_PTHREAD_THREADS
-#if HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP
+#if defined HAVE_PTHREAD_ATTR_GETSTACK && defined HAVE_PTHREAD_GETATTR_NP
/* This method for GNU/Linux and perhaps some other systems.
It's not for MacOS X or Solaris 10, since pthread_getattr_np is not
available on them. */