[DVDnav-discuss] r1218 - in trunk/libdvdread/src: dvd_udf.c dvdread_internal.h

[diego]

Author: diego
Date: Sat Sep 11 17:15:43 2010
New Revision: 1218

Log:
Move UDFReadBlocksRaw declaration to dvdread_internal.h.

Modified:
   trunk/libdvdread/src/dvd_udf.c
   trunk/libdvdread/src/dvdread_internal.h

Modified: trunk/libdvdread/src/dvd_udf.c
==============================================================================
--- trunk/libdvdread/src/dvd_udf.c	Mon Aug  9 00:49:28 2010	(r1217)
+++ trunk/libdvdread/src/dvd_udf.c	Sat Sep 11 17:15:43 2010	(r1218)
@@ -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,

Modified: trunk/libdvdread/src/dvdread_internal.h
==============================================================================
--- trunk/libdvdread/src/dvdread_internal.h	Mon Aug  9 00:49:28 2010	(r1217)
+++ trunk/libdvdread/src/dvdread_internal.h	Sat Sep 11 17:15:43 2010	(r1218)
@@ -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 */