svn commit: r449897 - in head/ftp/lftp: . files

[Emanuel Haupt]

Ganael Laplanche <ganael.laplanche at martymac.org> wrote:
> On Monday 18 September 2017 14:45:58 Mathieu Arnold wrote:
> 
> Hi Mathieu,
> 
> > After this, I have build failures:
> > 
> > In file included from ./signal.h:52:
> > /usr/include/signal.h:85:38: error: expected ')'
> > int     sigpending(sigset_t *) __nonnull(1);
> >                                          ^
> > /usr/include/signal.h:87:44: error: expected ')'
> > int     sigsuspend(const sigset_t *) __nonnull(1);
> >                                                ^
> > 2 errors generated.
> 
> Yes, those errors are related to the introduction of __nonnull()
> attributes in 11.0 (then removed in 11.1, see r311234). Build
> currently fails on 11.0 (only).
> 
> I still have to find a proper fix for those errors (any hint
> appreciated here :p).

Patch:

--- lib/cdefs.h.orig    2017-09-12 14:13:24 UTC
+++ lib/cdefs.h
@@ -282,13 +282,7 @@
 # define __attribute_format_strfmon__(a,b) /* Ignore */
 #endif
 
-/* The nonull function attribute allows to mark pointer parameters which
-   must not be NULL.  */
-#if __GNUC_PREREQ (3,3)
-# define __nonnull(params) __attribute__ ((__nonnull__ params))
-#else
 # define __nonnull(params)
-#endif
 
 /* If fortification mode, we warn about unused results of certain
    function calls which can lead to problems.  */