mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-30 08:50:23 +02:00
Code Activity

Remove reference to scm_init_popen' when fork' is unavailable.

Browse source 
Fixes <http://bugs.gnu.org/12477>.
Reported by lin ray <lin.wei.ray@gmail.com>.

* configure.ac: Define the `HAVE_FORK' Automake conditional.
* module/Makefile.am (ICE_9_SOURCES): Add `ice-9/popen.scm' only when
  HAVE_FORK.
* libguile/posix.c (scm_init_posix): Register `scm_init_popen' only when
  HAVE_FORK.
This commit is contained in:
Ludovic Courtès 2012-11-23 23:37:29 +01:00
parent 06906f370f
commit 712ca51ffe
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -748,11 +748,14 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
# isblank - available as a GNU extension or in C99 # isblank - available as a GNU extension or in C99
# _NSGetEnviron - Darwin specific # _NSGetEnviron - Darwin specific
# strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin # strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin
# fork - unavailable on Windows
# utimensat: posix.1-2008 # utimensat: posix.1-2008
# sched_getaffinity, sched_setaffinity: GNU extensions (glibc) # sched_getaffinity, sched_setaffinity: GNU extensions (glibc)
# #
AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid fesetround ftime ftruncate fchown fchmod getcwd geteuid getsid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe poll readdir_r readdir64_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron strcoll strcoll_l newlocale utimensat sched_getaffinity sched_setaffinity]) AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid fesetround ftime ftruncate fchown fchmod getcwd geteuid getsid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe poll readdir_r readdir64_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron strcoll strcoll_l newlocale utimensat sched_getaffinity sched_setaffinity])
AM_CONDITIONAL([HAVE_FORK], [test "x$ac_cv_func_fork" = "xyes"])
# Reasons for testing: # Reasons for testing:
# netdb.h - not in mingw # netdb.h - not in mingw
# sys/param.h - not in mingw # sys/param.h - not in mingw

7
libguile/posix.c
View file

@ -1,5 +1,6 @@
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. /* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
* * 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3 of * as published by the Free Software Foundation; either version 3 of
@ -2375,10 +2376,12 @@ scm_init_posix ()
#include "libguile/cpp-SIG.c" #include "libguile/cpp-SIG.c"
#include "libguile/posix.x" #include "libguile/posix.x"
#ifdef HAVE_FORK
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
"scm_init_popen", "scm_init_popen",
(scm_t_extension_init_func) scm_init_popen, (scm_t_extension_init_func) scm_init_popen,
NULL); NULL);
#endif /* HAVE_FORK */
} }
/* /*

8
module/Makefile.am
View file

@ -220,7 +220,6 @@ ICE_9_SOURCES = \
ice-9/optargs.scm \ ice-9/optargs.scm \
ice-9/poe.scm \ ice-9/poe.scm \
ice-9/poll.scm \ ice-9/poll.scm \
ice-9/popen.scm \
ice-9/posix.scm \ ice-9/posix.scm \
ice-9/q.scm \ ice-9/q.scm \
ice-9/rdelim.scm \ ice-9/rdelim.scm \
@ -252,6 +251,13 @@ ICE_9_SOURCES = \
ice-9/serialize.scm \ ice-9/serialize.scm \
ice-9/local-eval.scm ice-9/local-eval.scm
if HAVE_FORK
# This functionality is missing on systems without `fork'---i.e., Windows.
ICE_9_SOURCES += ice-9/popen.scm
endif HAVE_FORK
SRFI_SOURCES = \ SRFI_SOURCES = \
srfi/srfi-2.scm \ srfi/srfi-2.scm \
srfi/srfi-4.scm \ srfi/srfi-4.scm \