[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-241-g950a966

[Mark H Weaver]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=950a966e643c5f979e73ae6fbce4d0424f2a6396

The branch, stable-2.0 has been updated
       via  950a966e643c5f979e73ae6fbce4d0424f2a6396 (commit)
       via  17d4daa8bd11176c2ebe0d35ac48da3d247094ff (commit)
      from  21a7ba9b7e7e97854678677c7da4b42bd9faec66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 950a966e643c5f979e73ae6fbce4d0424f2a6396
Author: Mark H Weaver <address@hidden>
Date:   Thu Mar 13 23:21:48 2014 -0400

    Check SCM_USE_PTHREAD_THREADS using #if not #ifdef.
    
    * libguile/bdw-gc.h: Check SCM_USE_PTHREAD_THREADS using #if not #ifdef.

commit 17d4daa8bd11176c2ebe0d35ac48da3d247094ff
Author: Mark H Weaver <address@hidden>
Date:   Thu Mar 13 16:47:11 2014 -0400

    Include <config.h> in gen-scmconfig even when cross-compiling.
    
    Partially reverts 8cb0d6d7fa9aaac316c29a64c541336b51b6f93d.
    
    * libguile/Makefile.am (gen-scmconfig.$(OBJEXT)): Remove
      -DCROSS_COMPILING=1 from cross-compiling case.
    * libguile/gen-scmconfig.c: Include <config.h> regardless of
      whether CROSS_COMPILING is defined.

-----------------------------------------------------------------------

Summary of changes:
 libguile/Makefile.am     |   13 ++++++-------
 libguile/bdw-gc.h        |    2 +-
 libguile/gen-scmconfig.c |    8 +++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index dd6d662..5decd99 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -60,13 +60,12 @@ gen_scmconfig_SOURCES = gen-scmconfig.c
 ## the generated config.h and gen-scmconfig.h.  Nothing else from Guile
 ## is included by this code generator.
 gen-scmconfig.$(OBJEXT): gen-scmconfig.c
-       $(AM_V_GEN)                                             \
-       if [ "$(cross_compiling)" = "yes" ]; then               \
-               $(CC_FOR_BUILD) -DCROSS_COMPILING=1 $(DEFS)     \
-                  $(DEFAULT_INCLUDES) -I$(top_builddir)        \
-                  -c -o "$@" "$<";                             \
-       else                                                    \
-               $(COMPILE) -c -o "$@" "$<";                     \
+       $(AM_V_GEN) \
+       if [ "$(cross_compiling)" = "yes" ]; then \
+               $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \
+                  -c -o $@ $<; \
+       else \
+               $(COMPILE) -c -o $@ $<; \
        fi
 
 ## Override default rule; this should run on BUILD host.
diff --git a/libguile/bdw-gc.h b/libguile/bdw-gc.h
index 7aa757f..d6f0077 100644
--- a/libguile/bdw-gc.h
+++ b/libguile/bdw-gc.h
@@ -23,7 +23,7 @@
 
 #include "libguile/scmconfig.h"
 
-#ifdef SCM_USE_PTHREAD_THREADS
+#if SCM_USE_PTHREAD_THREADS
 
 /* When pthreads are used, let `libgc' know about it and redirect allocation
    calls such as `GC_MALLOC ()' to (contention-free, faster) thread-local
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index 3c8be4f..2f6fa6e 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2013 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
@@ -132,10 +132,8 @@
 
  **********************************************************************/
 
-/* Don't include <config.h> when cross-compiling because it contains
-   information about the host, not about the build machine.  */
-#ifndef CROSS_COMPILING
-# include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
 #endif
 
 #include <libguile/gen-scmconfig.h>


hooks/post-receive
-- 
GNU Guile