Re: Octave's m4/acx_pthread.m4 & OSX

[Jarno Rajahalme]

On Sep 6, 2010, at 16:13 , ext Ben Abbott wrote:

> On Sep 6, 2010, at 7:27 AM, Jarno Rajahalme wrote:
...
> In any event, there are some additional changes I'm using to build on MacOS 
> 10.6. One has to do with OpenGL ...
> 
>  sed -i 's/^extern int _gl_warn_on_use$/_GL_EXTERN_C int _gl_warn_on_use/g' 
> ./build-aux/warn-on-use.h
> 
> I'm also applying the diff below.
> 
> ----------------------
> diff -r 271c5262975b src/sighandlers.cc
> --- a/src/sighandlers.cc  Tue Mar 16 12:29:49 2010 +0100
> +++ b/src/sighandlers.cc  Tue Mar 16 18:29:24 2010 -0400
> @@ -195,6 +195,7 @@
>     act.sa_flags |= SA_RESTART;
> #endif
> 
> +#undef sigemptyset 
>   gnulib::sigemptyset (&act.sa_mask);
>   gnulib::sigemptyset (&oact.sa_mask);
> 
> @@ -229,6 +230,7 @@
> 
>   sigset_t set, oset;
> 
> +#undef sigaddset
>   BLOCK_CHILD (set, oset);
> 
>   if (octave_child_list::wait ())
> ----------------------
> 
> Jarno, do you not need the patch to sighandlers.cc or the change to 
> warn-on-use.h?
> 

No, it appears these are fixed in gnulib:

ChangeLog:
2010-03-20  Bruno Haible  <address@hidden>

        signal: Undefine macro definitions in C++ mode.
        * lib/signal.in.h (sigismember, sigemptyset, sigaddset, sigdelset,
        sigfillset): Undefine macro definitions from the system header in C++
        mode.
        Reported by John W. Eaton <address@hidden>.

libgnu/signal.in.h:

/* This function is defined as a macro on MacOS X.  */
#  if defined __cplusplus && defined GNULIB_NAMESPACE
#   undef sigemptyset
#  endif
...
/* This function is defined as a macro on MacOS X.  */
#  if defined __cplusplus && defined GNULIB_NAMESPACE
#   undef sigaddset
#  endif


ChangeLog:
2010-03-20  Bruno Haible  <address@hidden>

        Make _GL_WARN_ON_USE usable in C++ and C mode in the same compilation.
        * build-aux/warn-on-use.h (_GL_WARN_EXTERN_C): New macro.
        (_GL_WARN_ON_USE, _GL_WARN_ON_USE_CXX): Likewise.
        Reported by John W. Eaton <address@hidden>.

warn_on_use.h:

_GL_WARN_EXTERN_C int _gl_warn_on_use
_GL_WARN_EXTERN_C int _gl_warn_on_use


  Jarno