From 82cfa129209fbc76cd8fdac992703f66ccccfc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Tue, 14 Sep 2010 07:19:00 +0200 Subject: [PATCH] A little bit of cleanup. --- CMakeLists.txt | 6 ------ config.h.in | 21 --------------------- src/main.c | 1 - src/symbol-library.c | 1 - src/window-main.c | 2 -- 5 files changed, 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63529e4..fc09eb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,12 +42,6 @@ HAVE_RESTRICT) include (CheckFunctionExists) -CHECK_FUNCTION_EXISTS ("snprintf" HAVE_SNPRINTF) -CHECK_FUNCTION_EXISTS ("sprintf_s" HAVE_SPRINTF_S) - -CHECK_FUNCTION_EXISTS ("strdup" HAVE_STRDUP) -CHECK_FUNCTION_EXISTS ("_strdup" HAVE__STRDUP) - CHECK_FUNCTION_EXISTS ("strtok_r" HAVE_STRTOK_R) CHECK_FUNCTION_EXISTS ("strtok_s" HAVE_STRTOK_S) diff --git a/config.h.in b/config.h.in index 19a43db..1799b4c 100644 --- a/config.h.in +++ b/config.h.in @@ -21,12 +21,6 @@ #cmakedefine HAVE_SANE___RESTRICT #cmakedefine HAVE_RESTRICT -#cmakedefine HAVE_SNPRINTF -#cmakedefine HAVE_SPRINTF_S - -#cmakedefine HAVE_STRDUP -#cmakedefine HAVE__STRDUP - #cmakedefine HAVE_STRTOK_R #cmakedefine HAVE_STRTOK_S #cmakedefine HAVE_THREADSAFE_STRTOK @@ -57,21 +51,6 @@ #endif #endif /* ! HAVE_SANE___RESTRICT */ -#ifndef HAVE_SNPRINTF - #ifdef HAVE_SPRINTF_S - #define snprintf sprintf_s - #endif -#endif /* ! HAVE_SPRINTF */ - -#ifdef HAVE__STRDUP - #define strdup _strdup -#elif !defined(HAVE_STRDUP) -static inline char *strdup (char *s) -{ - return strcpy(malloc(strlen(s) + 1), s); -} -#endif /* HAVE_STRDUP */ - #ifndef HAVE_STRTOK_R #ifdef HAVE_STRTOK_S #define strtok_r strtok_s diff --git a/src/main.c b/src/main.c index ed0dfb7..5c9723f 100644 --- a/src/main.c +++ b/src/main.c @@ -9,7 +9,6 @@ */ #include -#include #include "config.h" diff --git a/src/symbol-library.c b/src/symbol-library.c index 3f4e078..743aa39 100644 --- a/src/symbol-library.c +++ b/src/symbol-library.c @@ -11,7 +11,6 @@ #include #include /* #include */ -#include #include "config.h" diff --git a/src/window-main.c b/src/window-main.c index a34d5ed..f5133e5 100644 --- a/src/window-main.c +++ b/src/window-main.c @@ -9,8 +9,6 @@ */ #include -#include -#include #include "config.h"