Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -46,13 +46,6 @@
#include "test.h"
extern gint global_passed, global_tests;
#ifndef HAVE_VASPRINTF
/* systen does not provide a vasprintf function, use the one
provided within eglib itself */
extern int vasprintf(char **ret, const char *format, va_list ap);
#endif
static gchar *last_result = NULL;
gboolean
@@ -183,7 +176,7 @@ FAILED(const gchar *format, ...)
return NULL;
#else
va_start(args, format);
n = vasprintf(&ret, format, args);
n = g_vasprintf(&ret, format, args);
va_end(args);
if(n == -1) {