[libdvdcss-devel] [PATCH] Drop fallback definitions for POSIX integer types.
Diego Biurrun
diego at biurrun.de
Fri Nov 14 15:32:28 CET 2014
All relevant toolchains support POSIX integer types now.
---
src/common.h | 15 ---------------
src/css.h | 3 ++-
src/csstables.h | 2 +-
src/ioctl.h | 2 +-
4 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/common.h b/src/common.h
index 259477b..71ef811 100644
--- a/src/common.h
+++ b/src/common.h
@@ -26,21 +26,6 @@
#ifndef DVDCSS_COMMON_H
#define DVDCSS_COMMON_H
-/*****************************************************************************
- * Basic types definitions
- *****************************************************************************/
-#if defined( HAVE_STDINT_H )
-# include <stdint.h>
-#elif defined( HAVE_INTTYPES_H )
-# include <inttypes.h>
-#else
- /* Fallback types (very x86-centric, sorry) */
- typedef unsigned char uint8_t;
- typedef signed char int8_t;
- typedef unsigned int uint32_t;
- typedef signed int int32_t;
-#endif
-
#if defined( WIN32 )
# include <io.h> /* _lseeki64 */
diff --git a/src/css.h b/src/css.h
index 2f5dfc0..de8da24 100644
--- a/src/css.h
+++ b/src/css.h
@@ -29,7 +29,8 @@
#ifndef DVDCSS_CSS_H
#define DVDCSS_CSS_H
-#include "common.h"
+#include <stdint.h>
+
#include "dvdcss/dvdcss.h"
#define CACHE_FILENAME_LENGTH_STRING "10"
diff --git a/src/csstables.h b/src/csstables.h
index 6dadbb3..14c5e27 100644
--- a/src/csstables.h
+++ b/src/csstables.h
@@ -31,7 +31,7 @@
#ifndef DVDCSS_CSSTABLES_H
#define DVDCSS_CSSTABLES_H
-#include "common.h"
+#include <stdint.h>
static const uint8_t p_css_tab1[ 256 ] =
{
diff --git a/src/ioctl.h b/src/ioctl.h
index 77e8be0..ab8c42e 100644
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -23,7 +23,7 @@
#ifndef DVDCSS_IOCTL_H
#define DVDCSS_IOCTL_H
-#include "common.h"
+#include <stdint.h>
int ioctl_ReadCopyright ( int, int, int * );
int ioctl_ReadDiscKey ( int, const int *, uint8_t * );
--
2.1.0
More information about the libdvdcss-devel
mailing list