changeset 62:3bc841283972 src

Move UDFReadBlocksRaw declaration to dvdread_internal.h.
author diego
date Sat, 11 Sep 2010 15:15:43 +0000
parents eac01aeb7be5
children 46c05a214511
files dvd_udf.c dvdread_internal.h
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dvd_udf.c	Sun Aug 08 22:49:28 2010 +0000
+++ b/dvd_udf.c	Sat Sep 11 15:15:43 2010 +0000
@@ -37,14 +37,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include "dvdread_internal.h"
 #include "dvdread/dvd_reader.h"
 #include "dvdread/dvd_udf.h"
 
-/* Private but located in/shared with dvd_reader.c */
-extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
-                             size_t block_count, unsigned char *data,
-                             int encrypted );
-
 /* It's required to either fail or deliver all the blocks asked for. */
 static int DVDReadLBUDF( dvd_reader_t *device, uint32_t lb_number,
                          size_t block_count, unsigned char *data,
--- a/dvdread_internal.h	Sun Aug 08 22:49:28 2010 +0000
+++ b/dvdread_internal.h	Sat Sep 11 15:15:43 2010 +0000
@@ -19,10 +19,15 @@
 #ifndef LIBDVDREAD_DVDREAD_INTERNAL_H
 #define LIBDVDREAD_DVDREAD_INTERNAL_H
 
+#include <stdint.h>
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <unistd.h>
 #endif /* _WIN32 */
 
+#include "dvdread/dvd_reader.h"
+
 #define CHECK_VALUE(arg)                                                \
   if(!(arg)) {                                                          \
     fprintf(stderr, "\n*** libdvdread: CHECK_VALUE failed in %s:%i ***" \
@@ -30,4 +35,7 @@
             __FILE__, __LINE__, # arg );                                \
   }
 
+int UDFReadBlocksRaw(dvd_reader_t *device, uint32_t lb_number,
+                     size_t block_count, unsigned char *data, int encrypted);
+
 #endif /* LIBDVDREAD_DVDREAD_INTERNAL_H */