# HG changeset patch
# User diego
# Date 1221423077 0
# Node ID d232a96ac23143380f57744bb87ae4d4d81d53c2
# Parent  ef8c0e834a14c70172901e3e2a9753f515691c2e
Use consistent multiple inclusion guards everywhere:
Combine them from a LIBDVDNAV_ prefix and the filename.

diff -r ef8c0e834a14 -r d232a96ac231 dvd_types.h
--- a/dvd_types.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/dvd_types.h	Sun Sep 14 20:11:17 2008 +0000
@@ -26,8 +26,8 @@
  * Various useful structs and enums for DVDs.
  */
 
-#ifndef DVD_H_INCLUDED
-#define DVD_H_INCLUDED
+#ifndef LIBDVDNAV_DVD_TYPES_H
+#define LIBDVDNAV_DVD_TYPES_H
 
 /*
  * DVD Menu ID
@@ -275,4 +275,4 @@
 
 #endif
 
-#endif /* DVD_H_INCLUDED */
+#endif /* LIBDVDNAV_DVD_TYPES_H */
diff -r ef8c0e834a14 -r d232a96ac231 dvdnav.h
--- a/dvdnav.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/dvdnav.h	Sun Sep 14 20:11:17 2008 +0000
@@ -26,8 +26,8 @@
  * to access dvdnav functionality.
  */
 
-#ifndef DVDNAV_H_INCLUDED
-#define DVDNAV_H_INCLUDED
+#ifndef LIBDVDNAV_DVDNAV_H
+#define LIBDVDNAV_DVDNAV_H
 
 #define MP_DVDNAV 1
 
@@ -681,4 +681,4 @@
 }
 #endif
 
-#endif /* DVDNAV_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_H */
diff -r ef8c0e834a14 -r d232a96ac231 dvdnav_events.h
--- a/dvdnav_events.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/dvdnav_events.h	Sun Sep 14 20:11:17 2008 +0000
@@ -25,8 +25,8 @@
  * This header defines events and event types
  */
 
-#ifndef DVDNAV_EVENTS_H_INCLUDED
-#define DVDNAV_EVENTS_H_INCLUDED
+#ifndef LIBDVDNAV_DVDNAV_EVENTS_H
+#define LIBDVDNAV_DVDNAV_EVENTS_H
 
 /*
  * DVDNAV_BLOCK_OK
@@ -236,4 +236,4 @@
 #define DVDNAV_WAIT			13
 
 
-#endif /* DVDNAV_EVENTS_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_EVENTS_H */
diff -r ef8c0e834a14 -r d232a96ac231 dvdnav_internal.h
--- a/dvdnav_internal.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/dvdnav_internal.h	Sun Sep 14 20:11:17 2008 +0000
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef DVDNAV_INTERNAL_H_INCLUDED
-#define DVDNAV_INTERNAL_H_INCLUDED
+#ifndef LIBDVDNAV_DVDNAV_INTERNAL_H
+#define LIBDVDNAV_DVDNAV_INTERNAL_H
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -195,4 +195,4 @@
 #define printerr(str) \
 	do { if (this) strncpy(this->err_str, str, MAX_ERR_LEN - 1); } while (0)
 
-#endif /* DVDNAV_INTERNAL_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_INTERNAL_H */
diff -r ef8c0e834a14 -r d232a96ac231 read_cache.h
--- a/read_cache.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/read_cache.h	Sun Sep 14 20:11:17 2008 +0000
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __DVDNAV_READ_CACHE_H
-#define __DVDNAV_READ_CACHE_H
+#ifndef LIBDVDNAV_READ_CACHE_H
+#define LIBDVDNAV_READ_CACHE_H
 
 /* Opaque cache type -- defined in dvdnav_internal.h */
 /* typedef struct read_cache_s read_cache_t; */
@@ -46,4 +46,4 @@
  * Those buffers must _never_ be freed. */
 int dvdnav_read_cache_block(read_cache_t *self, int sector, size_t block_count, uint8_t **buf);
 
-#endif /* __DVDNAV_READ_CACHE_H */
+#endif /* LIBDVDNAV_READ_CACHE_H */
diff -r ef8c0e834a14 -r d232a96ac231 remap.h
--- a/remap.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/remap.h	Sun Sep 14 20:11:17 2008 +0000
@@ -18,8 +18,8 @@
  * $Id$
  */
 
-#ifndef __REMAP__H
-#define __REMAP__H
+#ifndef LIBDVDNAV_REMAP_H
+#define LIBDVDNAV_REMAP_H
 typedef struct block_s block_t;
 
 typedef struct remap_s remap_t;
@@ -30,4 +30,4 @@
 	remap_t *map, int domain, int title, int program,
 	unsigned long cblock, unsigned long offset);
 
-#endif
+#endif /* LIBDVDNAV_REMAP_H */
diff -r ef8c0e834a14 -r d232a96ac231 vm/decoder.h
--- a/vm/decoder.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/vm/decoder.h	Sun Sep 14 20:11:17 2008 +0000
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef DECODER_H_INCLUDED
-#define DECODER_H_INCLUDED
+#ifndef LIBDVDNAV_DECODER_H
+#define LIBDVDNAV_DECODER_H
 
 /* link command types */
 typedef enum {
@@ -109,4 +109,4 @@
 void vm_print_registers( registers_t *registers );
 #endif
 
-#endif /* DECODER_H_INCLUDED */
+#endif /* LIBDVDNAV_DECODER_H */
diff -r ef8c0e834a14 -r d232a96ac231 vm/vm.h
--- a/vm/vm.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/vm/vm.h	Sun Sep 14 20:11:17 2008 +0000
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VM_H_INCLUDED
-#define VM_H_INCLUDED
+#ifndef LIBDVDNAV_VM_H
+#define LIBDVDNAV_VM_H
 
 /* DOMAIN enum */
 
@@ -179,4 +179,4 @@
 #endif
 
 
-#endif /* VM_HV_INCLUDED */
+#endif /* LIBDVDNAV_VM_H */
diff -r ef8c0e834a14 -r d232a96ac231 vm/vmcmd.h
--- a/vm/vmcmd.h	Sun Sep 14 16:05:09 2008 +0000
+++ b/vm/vmcmd.h	Sun Sep 14 20:11:17 2008 +0000
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef VMCMD_H_INCLUDED
-#define VMCMD_H_INCLUDED
+#ifndef LIBDVDNAV_VMCMD_H
+#define LIBDVDNAV_VMCMD_H
 
 void vm_print_mnemonic(vm_cmd_t *command);
 void vm_print_cmd(int row, vm_cmd_t *command);
 
-#endif /* VMCMD_H_INCLUDED */
+#endif /* LIBDVDNAV_VMCMD_H */