From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 6 Jan 2010 12:22:34 +0000 (+0200)
Subject: Revert "compat: implement tdestroy (GNU extension not available on OpenBSD)."
X-Git-Tag: 1.1.0-ff~1415
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=812f6667c9c0f6e9e84f5dbfb9e9bacd28f6a64b;p=vlc

Revert "compat: implement tdestroy (GNU extension not available on OpenBSD)."

This reverts commit 714d6155710c201562f2cdd78127c2fc59aebf43.

Conflicts:

	compat/tdestroy.c
	include/vlc_fixups.h
---

diff --git a/compat/tdestroy.c b/compat/tdestroy.c
deleted file mode 100644
index 180011a248..0000000000
--- a/compat/tdestroy.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * tdestroy.c: GNU tdestroy() replacement
- *****************************************************************************
- * Copyright © 1998-2009 the VideoLAN project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <search.h>
-
-typedef struct node_t
-{
-    void        *key;
-    struct node_t *left, *right;
-} node;
-
-static void tdestroy_recurse (node *root, __free_fn_t freefct)
-{
-    if (root->left != NULL)
-        tdestroy_recurse (root->left, freefct);
-    if (root->right != NULL)
-        tdestroy_recurse (root->right, freefct);
-    (*freefct) ((void *) root->key);
-    /* Free the node itself.  */
-    free (root);
-}
-
-void tdestroy (void *vroot, __free_fn_t freefct)
-{
-    node *root = (node *) vroot;
-    if (root != NULL) {
-        tdestroy_recurse (root, freefct);
-    }
-}
-
diff --git a/configure.ac b/configure.ac
index 8e3690398e..4a1bc8ccd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -570,7 +570,7 @@ need_libc=false
 dnl Check for usual libc functions
 AC_CHECK_FUNCS([gettimeofday isatty getpwuid_r memalign posix_memalign getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale])
 AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll vasprintf swab tdestroy])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll vasprintf swab])
 AC_CHECK_FUNCS([stricmp strnicmp])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index c14152fbca..7f85f6ea2e 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -204,11 +204,6 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 void swab (const void *, void *, ssize_t);
 #endif
 
-#ifndef HAVE_TDESTROY
-typedef void (*__free_fn_t) (void *__nodep);
-void tdestroy (void *vroot, __free_fn_t freefct);
-#endif
-
 /* Socket stuff */
 #ifndef HAVE_INET_PTON
 # define inet_pton vlc_inet_pton