summaryrefslogtreecommitdiff
path: root/libguile/error.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
committerAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
commit0858753e829fd399b55700688b4b2cb9c3ea6908 (patch)
tree55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/error.c
parent0aed71aa51e89e714de2392c2a5f44694dca77ea (diff)
parent817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff)
downloadguile-0858753e829fd399b55700688b4b2cb9c3ea6908.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION libguile/gc-malloc.c libguile/ports.c
Diffstat (limited to 'libguile/error.c')
-rw-r--r--libguile/error.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/error.c b/libguile/error.c
index b4ed7d055..790ed0571 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2004, 2006, 2010 Free Software Foundation, Inc.
- *
+/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2004, 2006, 2010,
+ * 2012 Free Software Foundation, Inc.
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3 of
@@ -99,7 +100,7 @@ SCM_DEFINE (scm_error_scm, "scm-error", 5, 0, 0,
}
#undef FUNC_NAME
-#ifdef __MINGW32__
+#if defined __MINGW32__ && defined HAVE_NETWORKING
# include "win32-socket.h"
# define SCM_I_STRERROR(err) \
((err >= WSABASEERR) ? scm_i_socket_strerror (err) : strerror (err))