From c70564040b6848be3b2d5f95fce178f97a95a421 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 2 Aug 2017 04:38:42 +0000 Subject: [PATCH] generic: get rid of kdefakes Signed-off-by: Ivailo Monev --- ConfigureChecks.cmake | 36 -- config.h.cmake | 2 - kdecore/CMakeLists.txt | 8 - kdecore/fakes.cpp | 549 --------------------------- kdecore/kdefakes.h.cmake | 96 ----- kdecore/tests/kmimetypetest.cpp | 1 - kdeui/itemviews/kcategorizedview.cpp | 3 - 7 files changed, 695 deletions(-) delete mode 100644 kdecore/fakes.cpp delete mode 100644 kdecore/kdefakes.h.cmake diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index bf11bb5e..9369f2ee 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -22,14 +22,6 @@ set( KDELIBSUFF ${LIB_SUFFIX} ) macro_bool_to_01(LIBINTL_FOUND ENABLE_NLS) # kdecore -# now check for dlfcn.h using the cmake supplied CHECK_INCLUDE_FILES() macro -# If definitions like -D_GNU_SOURCE are needed for these checks they -# should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally -# defined outside this file. Here we include these definitions in -# CMAKE_REQUIRED_DEFINITIONS so they will be included in the build of -# checks below. -set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS}) - check_include_files(stdio.h HAVE_STDIO_H) # various check_include_files(stdlib.h HAVE_STDLIB_H) # various check_include_files(string.h HAVE_STRING_H) # various @@ -182,37 +174,9 @@ if (UNIX) endif (UNIX) check_function_exists(getmntinfo HAVE_GETMNTINFO) # kdecore, kio -check_function_exists(initgroups HAVE_INITGROUPS) # kdecore/fakes.cpp -check_function_exists(mkstemps HAVE_MKSTEMPS) # dcop, kdecore/fakes.cpp -check_function_exists(mkstemp HAVE_MKSTEMP) # kdecore/fakes.cpp -check_function_exists(mkdtemp HAVE_MKDTEMP) # kdecore/fakes.cpp -check_function_exists(strlcpy HAVE_STRLCPY) # kdecore/fakes.cpp -check_function_exists(strlcat HAVE_STRLCAT) # kdecore/fakes.cpp -check_function_exists(setenv HAVE_SETENV) # kdecore/fakes.cpp -check_function_exists(seteuid HAVE_SETEUID) # kdecore/fakes.cpp check_function_exists(setmntent HAVE_SETMNTENT) # solid, kio, kdecore -check_function_exists(unsetenv HAVE_UNSETENV) # kdecore/fakes.cpp -check_function_exists(usleep HAVE_USLEEP) # kdecore/fakes.cpp, kdeui/qxembed -# check for prototypes [for functions provided by kdefakes when not available] - -check_symbol_exists(mkstemps "stdlib.h;unistd.h" HAVE_MKSTEMPS_PROTO) -check_symbol_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP_PROTO) -check_symbol_exists(mkstemp "stdlib.h;unistd.h" HAVE_MKSTEMP_PROTO) -check_symbol_exists(strlcat string.h HAVE_STRLCAT_PROTO) -check_symbol_exists(strlcpy string.h HAVE_STRLCPY_PROTO) check_symbol_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) -check_symbol_exists(setenv stdlib.h HAVE_SETENV_PROTO) -check_symbol_exists(unsetenv stdlib.h HAVE_UNSETENV_PROTO) -check_symbol_exists(usleep unistd.h HAVE_USLEEP_PROTO) -check_symbol_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO) -check_symbol_exists(setreuid unistd.h HAVE_SETREUID_PROTO) -check_symbol_exists(trunc math.h HAVE_TRUNC) -if(NOT HAVE_TRUNC) - # check_symbol_exists() may fail with either undefined refence (in C mode) or with wrong type (in C++ mode) - check_prototype_definition(trunc "double trunc(double arg)" "0.0" "math.h" HAVE_TRUNC_PROTO) - set(HAVE_TRUNC ${HAVE_TRUNC_PROTO}) -endif() # check for existing datatypes diff --git a/config.h.cmake b/config.h.cmake index c376e4e4..40cba368 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -112,5 +112,3 @@ int snprintf(char *str, size_t n, char const *fmt, ...); /* Defined to 1 if you have a d_type member in struct dirent */ #cmakedefine HAVE_DIRENT_D_TYPE 1 - -#include "kdecore/kdefakes.h" diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 552f78c6..c7df035d 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -6,12 +6,6 @@ configure_file( ${CMAKE_CURRENT_BINARY_DIR}/config-kstandarddirs.h ) -# Generate kdefakes.h -configure_file( - kdefakes.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h -) - # Generate kdeversion.h configure_file( util/kdeversion.h.cmake @@ -286,7 +280,6 @@ set(kdecore_LIB_SRCS util/kshell_unix.cpp util/kuser_unix.cpp util/kmacroexpander_unix.cpp - fakes.cpp ${kdecore_OPTIONAL_SRCS} ${KAUTH_BACKEND_SRCS} @@ -480,7 +473,6 @@ install( util/ksortablelist.h util/kuser.h util/qtest_kde.h - ${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel diff --git a/kdecore/fakes.cpp b/kdecore/fakes.cpp deleted file mode 100644 index 9c82a4dc..00000000 --- a/kdecore/fakes.cpp +++ /dev/null @@ -1,549 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) 2000 Stephan Kulow - Copyright (c) 2002 Dirk Mueller - Copyright (c) 2002 Oswald Buddenhagen - Copyright (c) 2003 Joseph Wenninger - Copyright (c) 2005 Jarosław Staniek - Copyright (c) 2007 Rafael Fernández López - - unsetenv() taken from the GNU C Library. - Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc. - - getgrouplist() taken from the FreeBSD libc. The copyright notice - in the file /usr/src/lib/libc/gen/getgrouplist.c on FreeBSD is out - of date, as it has incorrect copyright years and still names the - 4-clause BSD license -- however, the Regents of the University of - California at Berkeley have declared that clause 3 is void; only - clauses 1,2 and 4 apply. See the full license text below. - Copyright (c) 1991, 1993 - The Regents of the University of California. All rights reserved. - - - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include - -#include - - - -#define KDE_open open -#define KDE_mkdir mkdir - - -#ifndef HAVE_SETENV - -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif - -KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) { - int i; - char * a; - - if (!overwrite && getenv(name)) return 0; - - i = strlen(name) + strlen(value) + 2; - a = (char*)malloc(i); - if (!a) return 1; - - strcpy(a, name); - strcat(a, "="); - strcat(a, value); - - return putenv(a); -} -#endif /* !HAVE_SETENV */ - -#ifndef HAVE_UNSETENV - -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_ERRNO_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif - -#ifndef environ -extern char ** environ; -#endif - -KDECORE_EXPORT int unsetenv (const char *name) -{ - size_t len; - char **ep; - - if (name == NULL || *name == '\0' || strchr (name, '=') != NULL) - { - errno = EINVAL; - return -1; - } - - len = strlen (name); - - ep = environ; - while (*ep != NULL) - if (!strncmp (*ep, name, len) && (*ep)[len] == '=') - { - /* Found it. Remove this pointer by moving later ones back. */ - char **dp = ep; - - do - dp[0] = dp[1]; - while (*dp++); - /* Continue the loop in case NAME appears again. */ - } - else - ++ep; - - return 0; -} - -#endif /* !HAVE_UNSETENV */ - -#ifndef HAVE_USLEEP - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if defined(HAVE_SYS_TIME_H) -# include -# else -# include -# endif -#endif - -#ifdef HAVE_SYS_SELECT_H -#include -#endif - -#ifdef __cplusplus /* this is supposed to be a C source file but still.. */ -extern "C" { -#endif - -void usleep(unsigned int usec) { - struct timeval _usleep_tv; - _usleep_tv.tv_sec = usec/1000000; - _usleep_tv.tv_usec = usec%1000000; - select(0,0,0,0,&_usleep_tv); -} - -#ifdef __cplusplus -} -#endif - -#endif /* !HAVE_USLEEP */ - -#ifndef HAVE_SETEUID -int seteuid(uid_t euid) -{ - return setreuid(-1, euid); /* Well, if you have neither you are in trouble :) */ -} -#endif /* !HAVE_SETEUID */ - -#ifndef HAVE_MKSTEMPS -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_STAT_H -#include -#endif -#include -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STRINGS_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif - -/* this is based on code taken from the GNU libc, distributed under the LGPL license */ - -/* Generate a unique temporary file name from TEMPLATE. - - TEMPLATE has the form: - - /ccXXXXXX - - SUFFIX_LEN tells us how long is (it can be zero length). - - The last six characters of TEMPLATE before must be "XXXXXX"; - they are replaced with a string that makes the filename unique. - - Returns a file descriptor open on the file for reading and writing. */ - -KDECORE_EXPORT int mkstemps (char* _template, int suffix_len) -{ - static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - char *XXXXXX; - int len; - int count; - int value; - - len = strlen (_template); - - if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) - return -1; - - XXXXXX = &_template[len - 6 - suffix_len]; - - value = rand(); - for (count = 0; count < 256; ++count) - { - int v = value; - int fd; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = KDE_open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); - if (fd >= 0) - /* The file does not exist. */ - return fd; - - /* This is a random value. It is only necessary that the next - TMP_MAX values generated by adding 7777 to VALUE are different - with (module 2^32). */ - value += 7777; - } - /* We return the null string if we can't find a unique file name. */ - _template[0] = '\0'; - return -1; -} - -#endif /* !HAVE_MKSTEMPS */ - -#ifndef HAVE_MKSTEMP -KDECORE_EXPORT int mkstemp (char* _template) -{ - return mkstemps( _template, 0 ); -} -#endif /* !HAVE_MKSTEMP */ - -#ifndef HAVE_MKDTEMP - -#ifndef HAVE_MKSTEMPS -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_STAT_H -#include -#endif -#endif - -/* Generate a unique temporary directory name from TEMPLATE. - - TEMPLATE has the form: - - /ccXXXXXX - - - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. - - Returns a file descriptor open on the file for reading and writing. */ - -KDECORE_EXPORT char* mkdtemp (char* _template) -{ - static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - char *XXXXXX; - int len; - int count; - int value; - - len = strlen (_template); - - if ((int) len < 6 || strncmp (&_template[len - 6], "XXXXXX", 6)) - return 0; - - XXXXXX = &_template[len - 6]; - - value = rand(); - for (count = 0; count < 256; ++count) - { - int v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - /* This is a random value. It is only necessary that the next - TMP_MAX values generated by adding 7777 to VALUE are different - with (module 2^32). */ - value += 7777; - - if (!KDE_mkdir(_template,0700)) - return _template; - } - return 0; -} -#endif /* !HAVE_MKDTEMP */ - -#ifndef HAVE_STRLCPY - -#ifdef HAVE_STRING_H -#include -#endif - -KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize) -{ - unsigned long len, ret = strlen(s); - - if (ret >= bufsize) { - if (bufsize) { - len = bufsize - 1; - memcpy(d, s, len); - d[len] = '\0'; - } - } else - memcpy(d, s, ret + 1); - - return ret; -} -#endif /* !HAVE_STRLCPY */ - -/* - * Copyright (c) 1998 Todd C. Miller - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ - * $FreeBSD: src/lib/libc/string/strlcat.c,v 1.2.4.2 2001/07/09 23:30:06 obrien Exp $ - * $DragonFly: src/sys/libkern/strlcat.c,v 1.5 2007/06/07 23:45:02 dillon Exp $ - */ - -/* - * Appends src to string dst of size siz (unlike strncat, siz is the - * full size of dst, not space left). At most siz-1 characters - * will be copied. Always NUL terminates (unless siz <= strlen(dst)). - * Returns strlen(initial dst) + strlen(src); if retval >= siz, - * truncation occurred. - */ - -#ifndef HAVE_STRLCAT - -#ifdef HAVE_STRING_H -#include -#endif - -KDECORE_EXPORT unsigned long strlcat(char *dst, const char *src, unsigned long siz) -{ - char *d = dst; - const char *s = src; - unsigned long n = siz; - unsigned long dlen; - - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = siz - dlen; - - if (n == 0) - return(dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; - } - *d = '\0'; - - return(dlen + (s - src)); /* count does not include NUL */ -} -#endif /* !HAVE_STRLCAT */ - -#ifndef HAVE_TRUNC - -#include /* floor */ - -/* - * Here we simulate the trunc() function behavior. This function is not - * available for not C99 compatible systems. - * - * For example, Solaris 8. - */ - -KDECORE_EXPORT double trunc (double x) -{ - return x < 0 ? -floor(-x) : floor(x); -} -#endif /* !HAVE_TRUNC */ - - -#ifndef HAVE_GETGROUPLIST -/* Although this full license text is 4-clause BSD, it is taken directly - from the FreeBSD source tree; the Regents of the University of - California have deleted clause 3. See - http://www.freebsd.org/copyright/license.html - In addition, FreeBSD itself is now under a 2-clause BSD license, - which strikes clause 4 itself. That makes the *effective* license - on this file a 2-clause BSD license. I am including the complete - file, unmodified except for the #if 0 which is needed to avoid - the FreeBSD SCCS IDs. -*/ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; -#endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.14 2005/05/03 16:20:03 delphij Exp $"); -#endif - -/* - * get credential - */ -#include - -#include -#include -#include - -int -getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) -{ - const struct group *grp; - int i, maxgroups, ngroups, ret; - - ret = 0; - ngroups = 0; - maxgroups = *grpcnt; - /* - * When installing primary group, duplicate it; - * the first element of groups is the effective gid - * and will be overwritten when a setgid file is executed. - */ - groups[ngroups++] = agroup; - if (maxgroups > 1) - groups[ngroups++] = agroup; - /* - * Scan the group file to find additional groups. - */ - setgrent(); - while ((grp = getgrent()) != NULL) { - for (i = 0; i < ngroups; i++) { - if (grp->gr_gid == groups[i]) - goto skip; - } - for (i = 0; grp->gr_mem[i]; i++) { - if (!strcmp(grp->gr_mem[i], uname)) { - if (ngroups >= maxgroups) { - ret = -1; - break; - } - groups[ngroups++] = grp->gr_gid; - break; - } - } -skip: - ; - } - endgrent(); - *grpcnt = ngroups; - return (ret); -} -#endif - diff --git a/kdecore/kdefakes.h.cmake b/kdecore/kdefakes.h.cmake deleted file mode 100644 index 516fa74f..00000000 --- a/kdecore/kdefakes.h.cmake +++ /dev/null @@ -1,96 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) 2006 The KDE Project - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KDEFAKES_H -#define KDEFAKES_H - -/* This file defines the prototypes for a few (C library) functions for - platforms which either - 1) have those functions, but lack the prototypes in their header files. - 2) don't have those functions, in which case kdecore provides them - - You should include this file in any .cpp file that uses any one of these - functions: - strlcat, strlcpy, - setenv, unsetenv, - usleep, initgroups, - mkdtemp (this is for KTempDir itself, prefer using KTempDir everywhere else) - mkstemp, mkstemps (prefer to use QTemporaryfile instead) - trunc - getgrouplist -*/ - -#cmakedefine HAVE_STRLCAT_PROTO 1 -#if !defined(HAVE_STRLCAT_PROTO) -extern "C++" unsigned long strlcat(char*, const char*, unsigned long); -#endif - -#cmakedefine HAVE_STRLCPY_PROTO 1 -#if !defined(HAVE_STRLCPY_PROTO) -extern "C++" unsigned long strlcpy(char*, const char*, unsigned long); -#endif - -#cmakedefine HAVE_SETENV_PROTO 1 -#if !defined(HAVE_SETENV_PROTO) -extern "C++" int setenv (const char *, const char *, int); -#endif - -#cmakedefine HAVE_UNSETENV_PROTO 1 -#if !defined(HAVE_UNSETENV_PROTO) -extern "C++" int unsetenv (const char *); -#endif - -#cmakedefine HAVE_USLEEP_PROTO 1 -#if !defined(HAVE_USLEEP_PROTO) -extern "C++" int usleep (unsigned int); -#endif - -#cmakedefine HAVE_INITGROUPS_PROTO 1 -#if !defined(HAVE_INITGROUPS_PROTO) -#include -extern "C++" int initgroups(const char *, gid_t); -#endif - -#cmakedefine HAVE_MKDTEMP_PROTO 1 -#if !defined(HAVE_MKDTEMP_PROTO) -extern "C++" char *mkdtemp(char *); -#endif - -#cmakedefine HAVE_MKSTEMPS_PROTO 1 -#if !defined(HAVE_MKSTEMPS_PROTO) -extern "C++" int mkstemps(char *, int); -#endif - -#cmakedefine HAVE_MKSTEMP_PROTO 1 -#if !defined(HAVE_MKSTEMP_PROTO) -extern "C++" int mkstemp(char *); -#endif - -#cmakedefine HAVE_TRUNC 1 -#if !defined(HAVE_TRUNC) -extern "C++" double trunc(double); -#endif - -#cmakedefine HAVE_GETGROUPLIST 1 -#if !defined(HAVE_GETGROUPLIST) -#include /* for gid_t */ -extern "C++" int getgrouplist(const char *, gid_t , gid_t *, int *); -#endif - - -#endif /* KDEFAKES_H */ diff --git a/kdecore/tests/kmimetypetest.cpp b/kdecore/tests/kmimetypetest.cpp index 5ecfc2cd..80ad74ec 100644 --- a/kdecore/tests/kmimetypetest.cpp +++ b/kdecore/tests/kmimetypetest.cpp @@ -21,7 +21,6 @@ #include "kmimetypetest.h" #include -#include #include #include #include diff --git a/kdeui/itemviews/kcategorizedview.cpp b/kdeui/itemviews/kcategorizedview.cpp index c30399d3..fae9af38 100644 --- a/kdeui/itemviews/kcategorizedview.cpp +++ b/kdeui/itemviews/kcategorizedview.cpp @@ -32,9 +32,6 @@ #include "kcategorizedview.h" #include "kcategorizedview_p.h" -#include // trunc on C99 compliant systems -#include // trunc for not C99 compliant systems - #include #include #include