[libdvdnav-devel] [Git][videolan/libdvdnav][master] don't include dvdread/ifo_types.h directly

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / libdvdnav


Commits:
ee31c200 by Steve Lhomme at 2022-05-15T08:02:28+00:00
don't include dvdread/ifo_types.h directly

It's included via dvdread/nav_types.h with a possible #pragma pack(1) set and
unset in the right order.

- - - - -


13 changed files:

- msvc/include/dvdnav_internal.h
- src/dvdnav.c
- src/dvdnav/dvdnav.h
- src/navigation.c
- src/read_cache.c
- src/searching.c
- src/settings.c
- src/vm/decoder.c
- src/vm/getset.c
- src/vm/play.c
- src/vm/vm.c
- src/vm/vmcmd.c
- src/vm/vmget.c


Changes:

=====================================
msvc/include/dvdnav_internal.h
=====================================
@@ -37,7 +37,6 @@
 
 #include "dvd_reader.h"
 #include "ifo_read.h"
-#include "ifo_types.h"
 
 /* Uncomment for VM command tracing */
 /* #define TRACE */


=====================================
src/dvdnav.c
=====================================
@@ -38,7 +38,6 @@
 #include "dvdnav/dvdnav.h"
 #include <dvdread/dvd_reader.h>
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h> /* For vm_cmd_t */
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "vm/getset.h"


=====================================
src/dvdnav/dvdnav.h
=====================================
@@ -34,7 +34,6 @@ extern "C" {
 #include <dvdnav/dvd_types.h>
 #include <dvdread/dvd_reader.h>
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h> /* For vm_cmd_t */
 #include <dvdnav/dvdnav_events.h>
 
 #include <stdarg.h>


=====================================
src/navigation.c
=====================================
@@ -28,7 +28,6 @@
 #include <sys/time.h>
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"


=====================================
src/read_cache.c
=====================================
@@ -35,7 +35,6 @@
 #include <time.h>
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"


=====================================
src/searching.c
=====================================
@@ -31,7 +31,6 @@
 #include <sys/time.h>
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"


=====================================
src/settings.c
=====================================
@@ -28,7 +28,6 @@
 #include <sys/time.h>
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"


=====================================
src/vm/decoder.c
=====================================
@@ -33,7 +33,6 @@
 #include <assert.h>
 
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h> /* vm_cmd_t */
 
 #include "dvdnav/dvdnav.h"
 #include "decoder.h"


=====================================
src/vm/getset.c
=====================================
@@ -31,7 +31,6 @@
 #include <inttypes.h>
 
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include <dvdread/ifo_read.h>
 #include "dvdnav/dvdnav.h"
 


=====================================
src/vm/play.c
=====================================
@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include <dvdread/ifo_read.h>
 #include "dvdnav/dvdnav.h"
 


=====================================
src/vm/vm.c
=====================================
@@ -39,7 +39,6 @@
 #include <ctype.h>
 
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include <dvdread/ifo_read.h>
 #include "dvdnav/dvdnav.h"
 


=====================================
src/vm/vmcmd.c
=====================================
@@ -32,7 +32,6 @@
 
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include "decoder.h"
 #include "vm.h"
 #include "vmcmd.h"


=====================================
src/vm/vmget.c
=====================================
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 
 #include <dvdread/nav_types.h>
-#include <dvdread/ifo_types.h>
 #include <dvdread/ifo_read.h>
 #include "dvdnav/dvdnav.h"
 



View it on GitLab: https://code.videolan.org/videolan/libdvdnav/-/commit/ee31c2006852ea8640d11195f08a8f13519abc0f

-- 
View it on GitLab: https://code.videolan.org/videolan/libdvdnav/-/commit/ee31c2006852ea8640d11195f08a8f13519abc0f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance