libaacs | branch: master | npzacs <[email protected]> | Wed Sep 22 14:32:42 2010 +0300| [850d0d15b25f5ffb376cc6a39058937a5fb8c2a5] | committer: npzacs
BSD: include sys/select.h (Thanks to Brynet) > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=850d0d15b25f5ffb376cc6a39058937a5fb8c2a5 --- configure.ac | 2 +- src/libaacs/aacs.c | 8 ++++++++ src/libaacs/crypto.c | 8 ++++++++ src/libaacs/mmc.c | 1 + 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index b6a4e17..db903a6 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ AC_TYPE_SIGNAL # required headers AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h]) AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h]) -AC_CHECK_HEADERS([sys/time.h time.h pthread.h]) +AC_CHECK_HEADERS([sys/time.h time.h pthread.h sys/select.h]) # required structures AC_STRUCT_DIRENT_D_TYPE diff --git a/src/libaacs/aacs.c b/src/libaacs/aacs.c index 5dc007c..8e4ab98 100644 --- a/src/libaacs/aacs.c +++ b/src/libaacs/aacs.c @@ -17,6 +17,10 @@ * <http://www.gnu.org/licenses/>. */ +#if HAVE_CONFIG_H +#include "config.h" +#endif + #include <util/attributes.h> #include "aacs.h" @@ -32,8 +36,12 @@ #include <inttypes.h> #include <string.h> #include <stdio.h> +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif #include <gcrypt.h> + struct aacs { uint8_t pk[16], mk[16], vuk[16], vid[16], *uks; uint32_t num_uks; diff --git a/src/libaacs/crypto.c b/src/libaacs/crypto.c index 1ec2d2f..b16d94c 100644 --- a/src/libaacs/crypto.c +++ b/src/libaacs/crypto.c @@ -17,16 +17,24 @@ * <http://www.gnu.org/licenses/>. */ +#if HAVE_CONFIG_H +#include "config.h" +#endif + #include "crypto.h" #include "util/strutl.h" #include "util/macro.h" #include <string.h> #include <stdio.h> +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif #include <gcrypt.h> #include <pthread.h> #include <errno.h> + /* Set this in CFLAGS to debug gcrypt MPIs and S-expressions */ #ifndef GCRYPT_DEBUG #define GCRYPT_DEBUG 0 diff --git a/src/libaacs/mmc.c b/src/libaacs/mmc.c index d2a45c0..b4d154c 100644 --- a/src/libaacs/mmc.c +++ b/src/libaacs/mmc.c @@ -20,6 +20,7 @@ #if HAVE_CONFIG_H #include "config.h" #endif + #include "mmc.h" #include "crypto.h" #include "util/macro.h" _______________________________________________ libaacs-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libaacs-devel
