callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for crt_extern.h and _NSGetEnviron. Fix compilation on Darwin where

Browse Source 
2006-12-10  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Check for crt_extern.h and _NSGetEnviron.
        * gdk/x11/gdkspawn-x11.c: Fix compilation on Darwin where
        environ is not available.  (#384168, Min Sik Kim)
This commit is contained in:
Matthias Clasen
2006-12-10 06:31:53 +00:00
committed by Matthias Clasen
parent b8756357f3
commit 392492c0f8
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-10 Matthias Clasen <mclasen@redhat.com>
* configure.in: Check for crt_extern.h and _NSGetEnviron.
* gdk/x11/gdkspawn-x11.c: Fix compilation on Darwin where
environ is not available. (#384168, Min Sik Kim)
2006-12-07 Paolo Maggi <paolo@gnome.org> 2006-12-07 Paolo Maggi <paolo@gnome.org>
Fixes bug #383407 Fixes bug #383407

4
configure.in
View File

@ -728,6 +728,10 @@ else
pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
pixbuf_deplibs_check=`$pixbuf_libtool_config | \ pixbuf_deplibs_check=`$pixbuf_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
# Checks for gdkspawn
AC_CHECK_HEADERS(crt_externs.h)
AC_CHECK_FUNCS(_NSGetEnviron)
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
if test "x$pixbuf_deplibs_check" = "xnone" || \ if test "x$pixbuf_deplibs_check" = "xnone" || \
test "x$pixbuf_deplibs_check" = "xunknown" || \ test "x$pixbuf_deplibs_check" = "xunknown" || \

12
gdk/x11/gdkspawn-x11.c
View File

@ -22,13 +22,25 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#ifdef HAVE_CRT_EXTERNS_H
#include <crt_externs.h> /* for _NSGetEnviron */
#endif
#include "gdkspawn.h" #include "gdkspawn.h"
#include <glib.h> #include <glib.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include "gdkalias.h" #include "gdkalias.h"
#ifdef HAVE__NSGETENVIRON
#define environ (*_NSGetEnviron())
#else
/* According to the Single Unix Specification, environ is not in
* any system header, although unistd.h often declares it.
*/
extern char **environ; extern char **environ;
#endif
/** /**
* gdk_make_spawn_environment_for_screen: * gdk_make_spawn_environment_for_screen: