[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: KDE_3_1_BRANCH: kde-common/admin
From:       Andy Fawcett <andy () athame ! co ! uk>
Date:       2002-12-14 19:15:08
[Download RAW message or body]

Hi Dirk,

This commit broke kdelibs build for the BRANCH on FreeBSD 5.0 (at least, 
possibly other platforms, and other modules):

In file included from dcopclient.cpp:32:
../config.h:796: type specifier omitted for parameter `gid_t'
In file included from dcopclient.cpp:41:
/usr/include/unistd.h:470: declaration of C function `int 
initgroups(const char*, unsigned int)' conflicts with
../config.h:796: previous declaration `int initgroups(const char*)' here


Doing a local revert to 2.302.2.2 of acinclude.m4.in allows the build to 
complete.

gcc 3.2.1, am 1.7.1, ac 2.55


A.



On Wednesday 11 December 2002 19:14, Dirk Mueller wrote:
> CVS commit by mueller:
>
> correct strlcpy configure check (#51733 backport)
>
>
>   M +29 -23    acinclude.m4.in   2.302.2.3
>
>
> --- kde-common/admin/acinclude.m4.in  #2.302.2.2:2.302.2.3
> @@ -2002,5 +2002,5 @@
>  else
>    case "$1" in
> -       
> setenv|unsetenv|usleep|getdomainname|random|srandom|seteuid|mkstemps|
>mkstemp|revoke) +       
> setenv|unsetenv|usleep|getdomainname|random|srandom|seteuid|mkstemps|
>mkstemp|revoke|vsnprintf|strlcpy|strlcat) kde_cv_proto_$1="yes - in
> libkdefakes"
>                  ;;
> @@ -2189,4 +2189,29 @@
>  ])
>
> +AC_DEFUN(AC_CHECK_STRLCPY,
> +[
> +        KDE_CHECK_FUNC_EXT(strlcpy, [
> +#include <string.h>
> +],
> +[ char buf[20];
> +  strlcpy(buf, "KDE function test", sizeof(buf));
> +],
> +        [unsigned int strlcpy(char*, const char*, unsigned int)],
> +        [STRLCPY])
> +])
> +
> +AC_DEFUN(AC_CHECK_STRLCAT,
> +[
> +        KDE_CHECK_FUNC_EXT(strlcat, [
> +#include <string.h>
> +],
> +[ char buf[20];
> +  buf[0]='\0';
> +  strlat(buf, "KDE function test", sizeof(buf));
> +],
> +        [unsigned int strlcat(char*, const char*, unsigned int)],
> +        [STRLCAT])
> +])
> +
>  AC_DEFUN(AC_FIND_GIF,
>     [AC_MSG_CHECKING([for giflib])
> @@ -5252,5 +5277,6 @@
>  AC_DEFUN(KDE_CHECK_STRLCPY,
>  [
> -  AC_CHECK_FUNCS(strlcpy strlcat)
> +  AC_CHECK_STRLCPY
> +  AC_CHECK_STRLCAT
>    AC_CHECK_SIZEOF(size_t)
>    AC_CHECK_SIZEOF(unsigned int)
> @@ -5258,5 +5284,5 @@
>    AC_MSG_CHECKING([sizeof(size_t) == sizeof(unsigned int)])
>    AC_TRY_COMPILE(,[
> -    #if SIZEOF_SIZE_T != SIZEOF_INT
> +    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT
>         choke me
>      #endif
> @@ -5268,24 +5294,4 @@
>        ])
>    ])
> -
> -  AH_VERBATIM(_HAVE_STRLCPY,[
> -#ifndef HAVE_STRLCPY
> - #ifdef __cplusplus
> -extern "C" unsigned int strlcpy(char*,const char*,unsigned int)
> throw(); -#else
> -unsigned int strlcpy(char*,const char*,unsigned int);
> -#endif
> -#endif
> -  ])
> -
> -  AH_VERBATIM(_HAVE_STRLCAT,[
> -#ifndef HAVE_STRLCAT
> -#ifdef __cplusplus
> -extern "C" unsigned int strlcat(char*,const char*,unsigned int)
> throw(); -#else
> -unsigned int strlcat(char*,const char*,unsigned int);
> -#endif
> -#endif
> -])
>  ])

-- 
Andy Fawcett      |   "In an open world without walls and fences,
andy@athame.co.uk |      we wouldn't need Windows and Gates."
tap@lspace.org    |                              -- anon

[prev in list] [next in list] [prev in thread] [next in thread]