diff options
author | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
commit | 0858753e829fd399b55700688b4b2cb9c3ea6908 (patch) | |
tree | 55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/init.c | |
parent | 0aed71aa51e89e714de2392c2a5f44694dca77ea (diff) | |
parent | 817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff) | |
download | guile-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/init.c')
-rw-r--r-- | libguile/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libguile/init.c b/libguile/init.c index 35ab85603..3509ba315 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. - * +/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + * 2004, 2006, 2009, 2010, 2011, 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 @@ -91,7 +92,7 @@ #include "libguile/poll.h" #include "libguile/ports.h" #include "libguile/posix.h" -#ifdef HAVE_REGCOMP +#ifdef ENABLE_REGEX #include "libguile/regex-posix.h" #endif #include "libguile/print.h" @@ -452,7 +453,7 @@ scm_i_init_guile (void *base) #ifdef HAVE_POSIX scm_init_posix (); #endif -#ifdef HAVE_REGCOMP +#ifdef ENABLE_REGEX scm_init_regex_posix (); /* Requires smob_prehistory */ #endif scm_init_procs (); |