comparison includes.h @ 801:7dcb46da72d9 ecc

merge in HEAD
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 May 2013 12:09:35 +0800
parents f27058078d61
children 04ede40a529a
comparison
equal deleted inserted replaced
799:c344607b7341 801:7dcb46da72d9
118 118
119 #ifdef HAVE_LIBGEN_H 119 #ifdef HAVE_LIBGEN_H
120 #include <libgen.h> 120 #include <libgen.h>
121 #endif 121 #endif
122 122
123 #ifdef HAVE_SYS_UIO_H
124 #include <sys/uio.h>
125 #endif
126
123 #ifdef BUNDLED_LIBTOM 127 #ifdef BUNDLED_LIBTOM
124 #include "libtomcrypt/src/headers/tomcrypt.h" 128 #include "libtomcrypt/src/headers/tomcrypt.h"
125 #include "libtommath/tommath.h" 129 #include "libtommath/tommath.h"
126 #else 130 #else
127 #include <tomcrypt.h> 131 #include <tomcrypt.h>