#ifndef LIBVLC_FIXUPS_H
# define LIBVLC_FIXUPS_H 1
+#ifndef HAVE_STRDUP
# include <string.h>
# include <stdlib.h>
-
-#ifndef HAVE_STRDUP
static inline char *strdup (const char *str)
{
size_t len = strlen (str) + 1;
- char *res = malloc (len);
+ char *res = (char *)malloc (len);
if (res) memcpy (res, str, len);
return res;
}
#endif
#ifndef HAVE_VASPRINTF
-# define vasprintf vlc_vasprintf
+# include <stdio.h>
+# include <stdlib.h>
+# include <stdarg.h>
+static inline int vasprintf (char **strp, const char *fmt, va_list ap)
+{
+#ifndef UNDER_CE
+ int len = vsnprintf (NULL, 0, fmt, ap) + 1;
+ char *res = (char *)malloc (len);
+ if (res == NULL)
+ return -1;
+ *strp = res;
+ return vsprintf (res, fmt, ap);
+#else
+ /* HACK: vsnprintf in the WinCE API behaves like
+ * the one in glibc 2.0 and doesn't return the number of characters
+ * it needed to copy the string.
+ * cf http://msdn.microsoft.com/en-us/library/1kt27hek.aspx
+ * and cf the man page of vsnprintf
+ *
+ Guess we need no more than 50 bytes. */
+ int n, size = 50;
+ char *res, *np;
+
+ if ((res = (char *) malloc (size)) == NULL)
+ return -1;
+
+ while (1)
+ {
+ n = vsnprintf (res, size, fmt, ap);
+
+ /* If that worked, return the string. */
+ if (n > -1 && n < size)
+ {
+ *strp = res;
+ return n;
+ }
+
+ /* Else try again with more space. */
+ if (n == -1)
+ size *= 2; /* twice the old size */
+
+ if ((np = (char *) realloc (res, size)) == NULL)
+ {
+ free(res);
+ return -1;
+ }
+ else
+ {
+ res = np;
+ }
+
+ }
+#endif /* UNDER_CE */
+}
#endif
#ifndef HAVE_ASPRINTF
-# define asprintf vlc_asprintf
+# include <stdio.h>
+# include <stdarg.h>
+static inline int asprintf (char **strp, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+ va_start (ap, fmt);
+ ret = vasprintf (strp, fmt, ap);
+ va_end (ap);
+ return ret;
+}
#endif
#ifndef HAVE_STRNLEN
+# include <string.h>
static inline size_t strnlen (const char *str, size_t max)
{
- const char *end = memchr (str, 0, max);
+ const char *end = (const char *) memchr (str, 0, max);
return end ? (size_t)(end - str) : max;
}
#endif
#ifndef HAVE_STRNDUP
+# include <string.h>
+# include <stdlib.h>
static inline char *strndup (const char *str, size_t max)
{
size_t len = strnlen (str, max);
- char *res = malloc (len + 1);
+ char *res = (char *) malloc (len + 1);
if (res)
{
memcpy (res, str, len);
# define strtoll vlc_strtoll
#endif
+#ifndef HAVE_STRSEP
+# define strsep vlc_strsep
+#endif
+
#ifndef HAVE_ATOLL
# define atoll( str ) (strtoll ((str), (char **)NULL, 10))
#endif
#endif
#ifndef HAVE_GETENV
-static inline getenv (const char *name)
+static inline char *getenv (const char *name)
{
(void)name;
return NULL;
for (size_t i = 0;; i++)
{
int d = tolower (s1[i]) - tolower (s2[i]);
- if (d) return d;
+ if (d || !s1[i]) return d;
}
return 0;
}
for (size_t i = 0; i < n; i++)
{
int d = tolower (s1[i]) - tolower (s2[i]);
- if (d) return d;
+ if (d || !s1[i]) return d;
}
return 0;
}
}
#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)))
+#else
+# define ATTR_ALIGN(align)
+#endif
+
#ifndef HAVE_USELOCALE
typedef void *locale_t;
# define newlocale( a, b, c ) ((locale_t)0)
#if defined (ENABLE_NLS)
# include <libintl.h>
-#else
-# define dgettext(dom, str) ((char *)(str))
#endif
#define N_(str) gettext_noop (str)
#define gettext_noop(str) (str)
+#ifdef UNDER_CE
+static inline void rewind ( FILE *stream )
+{
+ fseek(stream, 0L, SEEK_SET);
+ clearerr(stream);
+}
+#endif
+
#endif /* !LIBVLC_FIXUPS_H */