Enhance portability of va_copy()

va_copy() is a C99 feature. In C89 implementations, it's sometimes
available as __va_copy(). If not, memcpy() should do the trick.
This commit is contained in:
Petri Lehtinen 2011-03-20 21:15:39 +02:00
parent 1111960120
commit b90ed1accb
2 changed files with 10 additions and 2 deletions

View File

@ -9,7 +9,6 @@
#define JANSSON_PRIVATE_H #define JANSSON_PRIVATE_H
#include <stddef.h> #include <stddef.h>
#include <stdarg.h>
#include "jansson.h" #include "jansson.h"
#include "hashtable.h" #include "hashtable.h"
@ -21,6 +20,16 @@
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))
#endif #endif
/* va_copy is a C99 feature. In C89 implementations, it's sometimes
available as __va_copy. If not, memcpy() should do the trick. */
#ifndef va_copy
#ifdef __va_copy
#define va_copy __va_copy
#else
#define va_copy(a, b) memcpy(&(a), &(b), sizeof(va_list))
#endif
#endif
typedef struct { typedef struct {
json_t json; json_t json;
hashtable_t hashtable; hashtable_t hashtable;

View File

@ -12,7 +12,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include <assert.h> #include <assert.h>
#include <jansson.h> #include <jansson.h>