
#ifndef __SODIUM_UTILS_H__
#define __SODIUM_UTILS_H__

#include <stddef.h>

#include "export.h"

#ifdef __cplusplus
extern "C" {
#endif

#if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
# define _SODIUM_C99(X)
#else
# define _SODIUM_C99(X) X
#endif

unsigned char *_sodium_alignedcalloc(unsigned char ** const unaligned_p,
                                     const size_t len);

SODIUM_EXPORT
void sodium_memzero(void * const pnt, const size_t len);

SODIUM_EXPORT
int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size);

SODIUM_EXPORT
char *sodium_bin2hex(char * const hex, const size_t hexlen,
                     const unsigned char *bin, const size_t binlen);

#ifdef __cplusplus
}
#endif

#endif


#ifndef __SODIUM_UTILS_H__
#define __SODIUM_UTILS_H__

#include <stddef.h>

#include "export.h"

#ifdef __cplusplus
extern "C" {
#endif

#ifndef __cplusplus
# define _SODIUM_C99(X) X
#else
# define _SODIUM_C99(X)
#endif

unsigned char *_sodium_alignedcalloc(unsigned char ** const unaligned_p,
                                     const size_t len);

SODIUM_EXPORT
void sodium_memzero(void * const pnt, const size_t len);

SODIUM_EXPORT
int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size);

SODIUM_EXPORT
char *sodium_bin2hex(char * const hex, const size_t hexlen,
                     const unsigned char *bin, const size_t binlen);

#ifdef __cplusplus
}
#endif

#endif

--- 
+++ 
@@ -10,10 +10,10 @@
 extern "C" {
 #endif
 
-#ifndef __cplusplus
+#if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+# define _SODIUM_C99(X)
+#else
 # define _SODIUM_C99(X) X
-#else
-# define _SODIUM_C99(X)
 #endif
 
 unsigned char *_sodium_alignedcalloc(unsigned char ** const unaligned_p,
Define _SODIUM_C99 as empty on retarded compilers, not only when using C++
