[DVDnav-discuss] r1141 - in trunk/libdvdnav: msvc/config.h msvc/include/dvdnav_internal.h src/dvd_types.h src/dvdnav.h src/dvdnav_events.h src/dvdnav_internal.h src/read_cache.h src/remap.h src/vm/decoder.h src/vm/vm.h src/vm/vmcmd.h
diego
subversion at mplayerhq.hu
Sun Sep 14 22:11:17 CEST 2008
Author: diego
Date: Sun Sep 14 22:11:17 2008
New Revision: 1141
Log:
Use consistent multiple inclusion guards everywhere:
Combine them from a LIBDVDNAV_ prefix and the filename.
Modified:
trunk/libdvdnav/msvc/config.h
trunk/libdvdnav/msvc/include/dvdnav_internal.h
trunk/libdvdnav/src/dvd_types.h
trunk/libdvdnav/src/dvdnav.h
trunk/libdvdnav/src/dvdnav_events.h
trunk/libdvdnav/src/dvdnav_internal.h
trunk/libdvdnav/src/read_cache.h
trunk/libdvdnav/src/remap.h
trunk/libdvdnav/src/vm/decoder.h
trunk/libdvdnav/src/vm/vm.h
trunk/libdvdnav/src/vm/vmcmd.h
Modified: trunk/libdvdnav/msvc/config.h
==============================================================================
--- trunk/libdvdnav/msvc/config.h (original)
+++ trunk/libdvdnav/msvc/config.h Sun Sep 14 22:11:17 2008
@@ -1,5 +1,8 @@
/* config.h. Generated by hand. */
+#ifndef LIBDVNAV_CONFIG_H
+#define LIBDVNAV_CONFIG_H
+
#define HAVE_DLFCN_H 1
/* #undef HAVE_DVDCSS_DVDCSS_H*/
/* #undef HAVE_INTTYPES_H */
@@ -49,3 +52,5 @@ typedef signed int int32_t;
typedef unsigned __int64 uint64_t;
typedef signed __int64 int64_t;
typedef unsigned int uintptr_t;
+
+#endif /* LIBDVNAV_CONFIG_H */
Modified: trunk/libdvdnav/msvc/include/dvdnav_internal.h
==============================================================================
--- trunk/libdvdnav/msvc/include/dvdnav_internal.h (original)
+++ trunk/libdvdnav/msvc/include/dvdnav_internal.h Sun Sep 14 22:11:17 2008
@@ -22,8 +22,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"
@@ -182,4 +182,4 @@ struct dvdnav_s {
#define S_OK DVDNAV_STATUS_OK
#endif /* MSC_VER */
-#endif /* DVDNAV_INTERNAL_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_INTERNAL_H */
Modified: trunk/libdvdnav/src/dvd_types.h
==============================================================================
--- trunk/libdvdnav/src/dvd_types.h (original)
+++ trunk/libdvdnav/src/dvd_types.h Sun Sep 14 22:11:17 2008
@@ -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 @@ typedef int DVDVideoCompression_t;
#endif
-#endif /* DVD_H_INCLUDED */
+#endif /* LIBDVDNAV_DVD_TYPES_H */
Modified: trunk/libdvdnav/src/dvdnav.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav.h (original)
+++ trunk/libdvdnav/src/dvdnav.h Sun Sep 14 22:11:17 2008
@@ -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 @@ int8_t dvdnav_is_domain_vts(dvdnav_t *se
}
#endif
-#endif /* DVDNAV_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_H */
Modified: trunk/libdvdnav/src/dvdnav_events.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav_events.h (original)
+++ trunk/libdvdnav/src/dvdnav_events.h Sun Sep 14 22:11:17 2008
@@ -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 @@ typedef struct {
#define DVDNAV_WAIT 13
-#endif /* DVDNAV_EVENTS_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_EVENTS_H */
Modified: trunk/libdvdnav/src/dvdnav_internal.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav_internal.h (original)
+++ trunk/libdvdnav/src/dvdnav_internal.h Sun Sep 14 22:11:17 2008
@@ -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 @@ int64_t dvdnav_convert_time(dvd_time_t *
#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 */
Modified: trunk/libdvdnav/src/read_cache.h
==============================================================================
--- trunk/libdvdnav/src/read_cache.h (original)
+++ trunk/libdvdnav/src/read_cache.h Sun Sep 14 22:11:17 2008
@@ -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 @@ void dvdnav_pre_cache_blocks(read_cache_
* 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 */
Modified: trunk/libdvdnav/src/remap.h
==============================================================================
--- trunk/libdvdnav/src/remap.h (original)
+++ trunk/libdvdnav/src/remap.h Sun Sep 14 22:11:17 2008
@@ -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 @@ unsigned long remap_block(
remap_t *map, int domain, int title, int program,
unsigned long cblock, unsigned long offset);
-#endif
+#endif /* LIBDVDNAV_REMAP_H */
Modified: trunk/libdvdnav/src/vm/decoder.h
==============================================================================
--- trunk/libdvdnav/src/vm/decoder.h (original)
+++ trunk/libdvdnav/src/vm/decoder.h Sun Sep 14 22:11:17 2008
@@ -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_link(link_t value);
void vm_print_registers( registers_t *registers );
#endif
-#endif /* DECODER_H_INCLUDED */
+#endif /* LIBDVDNAV_DECODER_H */
Modified: trunk/libdvdnav/src/vm/vm.h
==============================================================================
--- trunk/libdvdnav/src/vm/vm.h (original)
+++ trunk/libdvdnav/src/vm/vm.h Sun Sep 14 22:11:17 2008
@@ -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 @@ void vm_position_print(vm_t *vm, vm_posi
#endif
-#endif /* VM_HV_INCLUDED */
+#endif /* LIBDVDNAV_VM_H */
Modified: trunk/libdvdnav/src/vm/vmcmd.h
==============================================================================
--- trunk/libdvdnav/src/vm/vmcmd.h (original)
+++ trunk/libdvdnav/src/vm/vmcmd.h Sun Sep 14 22:11:17 2008
@@ -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 */
More information about the DVDnav-discuss
mailing list