/*****************************************************************************
- * fixups.h: portability fixups included from config.h
+ * vlc_fixups.h: portability fixups included from config.h
*****************************************************************************
* Copyright © 1998-2008 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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.
*****************************************************************************/
/**
# include <stdio.h> /* FILE */
#endif
-#if !defined (HAVE_STRLCPY) || \
+#if !defined (HAVE_POSIX_MEMALIGN) || \
+ !defined (HAVE_STRLCPY) || \
!defined (HAVE_STRNDUP) || \
- !defined (HAVE_STRNLEN) || \
- !defined (HAVE_GETCWD)
+ !defined (HAVE_STRNLEN)
# include <stddef.h> /* size_t */
#endif
# include <sys/types.h> /* ssize_t, pid_t */
#endif
-#ifndef HAVE_DIRFD
+#if !defined (HAVE_DIRFD) || \
+ !defined (HAVE_FDOPENDIR)
# include <dirent.h>
#endif
int strncasecmp (const char *, const char *, size_t);
#endif
+#ifndef HAVE_STRVERSCMP
+int strverscmp (const char *, const char *);
+#endif
+
#ifndef HAVE_STRNLEN
size_t strnlen (const char *, size_t);
#endif
#endif
/* unistd.h */
-#ifndef HAVE_GETCWD
-char *getcwd (char *buf, size_t size);
-#endif
-
#ifndef HAVE_GETPID
pid_t getpid (void);
#endif
+#ifndef HAVE_FSYNC
+int fsync (int fd);
+#endif
+
/* dirent.h */
#ifndef HAVE_DIRFD
-#ifdef __APPLE__
-#undef dirfd
+int (dirfd) (DIR *);
#endif
-int dirfd (DIR *);
+
+#ifndef HAVE_FDOPENDIR
+DIR *fdopendir (int);
#endif
#ifdef __cplusplus
int unsetenv (const char *);
#endif
+#ifndef HAVE_POSIX_MEMALIGN
+int posix_memalign (void **, size_t, size_t);
+#endif
+
/* locale.h */
#ifndef HAVE_USELOCALE
#define LC_NUMERIC_MASK 0
}
#endif
+#if !defined (HAVE_STATIC_ASSERT)
+# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
+# define static_assert _Static_assert
+#endif
+
/* Alignment of critical static data structures */
#ifdef ATTRIBUTE_ALIGNED_MAX
# define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
/* Socket stuff */
#ifndef HAVE_INET_PTON
-# define inet_pton vlc_inet_pton
-#endif
-
-#ifndef HAVE_INET_NTOP
-# define inet_ntop vlc_inet_ntop
+int inet_pton(int, const char *, void *);
+const char *inet_ntop(int, const void *, char *, int);
#endif
-#ifndef HAVE_POLL
+#ifndef HAVE_STRUCT_POLLFD
enum
{
POLLIN=1,
unsigned events;
unsigned revents;
};
-
-# define poll(a, b, c) vlc_poll(a, b, c)
-#elif defined (HAVE_MAEMO)
-# include <poll.h>
-# define poll(a, b, c) vlc_poll(a, b, c)
-int vlc_poll (struct pollfd *, unsigned, int);
+#endif
+#ifndef HAVE_POLL
+struct pollfd;
+int poll (struct pollfd *, unsigned, int);
#endif
#ifndef HAVE_IF_NAMEINDEX
unsigned if_index;
char *if_name;
};
-# define if_nametoindex(name) atoi(name)
+# ifndef HAVE_IF_NAMETOINDEX
+# define if_nametoindex(name) atoi(name)
+# endif
# define if_nameindex() (errno = ENOBUFS, NULL)
# define if_freenameindex(list) (void)0
#endif
long nrand48 (unsigned short subi[3]);
#endif
-#ifdef __ANDROID__
-# undef __linux__
-# ifndef __cplusplus
-# define __cplusplus 0
-# endif
-# include <pthread.h>
-# if __cplusplus == 0
-# undef __cplusplus
-# endif
-char *tempnam(const char *, const char *);
-#endif // ANDROID
-
#ifdef __OS2__
# undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */
#endif