mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
Revert "compat: implement tdestroy (GNU extension not available on OpenBSD)."
This reverts commit 714d615571
.
Conflicts:
compat/tdestroy.c
include/vlc_fixups.h
This commit is contained in:
parent
9106655f02
commit
812f6667c9
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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.])
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user