Mercurial > libdvdread4.hg
changeset 23:ac07d427fbc6 src
Use consistent multiple inclusion guards everywhere:
Combine them from a LIBDVDREAD_ prefix and the filename.
author | diego |
---|---|
date | Sun, 14 Sep 2008 20:37:38 +0000 |
parents | 447c5319a522 |
children | 3552a3d11604 |
files | bitreader.h bswap.h dvd_input.h dvd_reader.h dvd_udf.h dvdread_internal.h ifo_print.h ifo_read.h ifo_types.h md5.h nav_print.h nav_read.h nav_types.h |
diffstat | 13 files changed, 48 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/bitreader.h Sun Sep 14 16:00:48 2008 +0000 +++ b/bitreader.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef BITREADER_H_INCLUDED -#define BITREADER_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>. * @@ -21,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_BITREADER_H +#define LIBDVDREAD_BITREADER_H #ifdef __cplusplus extern "C" { @@ -39,4 +38,4 @@ #ifdef __cplusplus }; #endif -#endif /* BITREADER_H_INCLUDED */ +#endif /* LIBDVDREAD_BITREADER_H */
--- a/bswap.h Sun Sep 14 16:00:48 2008 +0000 +++ b/bswap.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef BSWAP_H_INCLUDED -#define BSWAP_H_INCLUDED - /* * Copyright (C) 2000, 2001 Billy Biggs <vektor@dumbterm.net>, * Håkan Hjort <d95hjort@dtek.chalmers.se> @@ -22,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_BSWAP_H +#define LIBDVDREAD_BSWAP_H + #include <config.h> #if defined(WORDS_BIGENDIAN) @@ -103,4 +103,4 @@ #endif /* WORDS_BIGENDIAN */ -#endif /* BSWAP_H_INCLUDED */ +#endif /* LIBDVDREAD_BSWAP_H */
--- a/dvd_input.h Sun Sep 14 16:00:48 2008 +0000 +++ b/dvd_input.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef DVD_INPUT_H_INCLUDED -#define DVD_INPUT_H_INCLUDED - /* * Copyright (C) 2001, 2002 Samuel Hocevar <sam@zoy.org>, * Håkan Hjort <d95hjort@dtek.chalmers.se> @@ -22,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_DVD_INPUT_H +#define LIBDVDREAD_DVD_INPUT_H + /** * Defines and flags. Make sure they fit the libdvdcss API! */ @@ -47,4 +47,4 @@ */ int dvdinput_setup(void); -#endif /* DVD_INPUT_H_INCLUDED */ +#endif /* LIBDVDREAD_DVD_INPUT_H */
--- a/dvd_reader.h Sun Sep 14 16:00:48 2008 +0000 +++ b/dvd_reader.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef DVD_READER_H_INCLUDED -#define DVD_READER_H_INCLUDED - /* * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>, * Håkan Hjort <d95hjort@dtek.chalmers.se>, @@ -23,6 +20,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_DVD_READER_H +#define LIBDVDREAD_DVD_READER_H + #ifdef _MSC_VER #include <config.h> @@ -274,4 +274,4 @@ #ifdef __cplusplus }; #endif -#endif /* DVD_READER_H_INCLUDED */ +#endif /* LIBDVDREAD_DVD_READER_H */
--- a/dvd_udf.h Sun Sep 14 16:00:48 2008 +0000 +++ b/dvd_udf.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef DVD_UDF_H_INCLUDED -#define DVD_UDF_H_INCLUDED - /* * This code is based on dvdudf by: * Christian Wolff <scarabaeus@convergence.de>. @@ -31,6 +28,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_DVD_UDF_H +#define LIBDVDREAD_DVD_UDF_H + #include <inttypes.h> #include "dvd_reader.h" @@ -59,4 +59,4 @@ #ifdef __cplusplus }; #endif -#endif /* DVD_UDF_H_INCLUDED */ +#endif /* LIBDVDREAD_DVD_UDF_H */
--- a/dvdread_internal.h Sun Sep 14 16:00:48 2008 +0000 +++ b/dvdread_internal.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,5 +1,5 @@ -#ifndef DVDREAD_INTERNAL_H -#define DVDREAD_INTERNAL_H +#ifndef LIBDVDREAD_DVDREAD_INTERNAL_H +#define LIBDVDREAD_DVDREAD_INTERNAL_H #ifdef _MSC_VER #include <unistd.h> @@ -12,4 +12,4 @@ __FILE__, __LINE__, # arg ); \ } -#endif /* DVDREAD_INTERNAL_H */ +#endif /* LIBDVDREAD_DVDREAD_INTERNAL_H */
--- a/ifo_print.h Sun Sep 14 16:00:48 2008 +0000 +++ b/ifo_print.h Sun Sep 14 20:37:38 2008 +0000 @@ -19,8 +19,8 @@ * */ -#ifndef IFO_PRINT_H_INCLUDED -#define IFO_PRINT_H_INCLUDED +#ifndef LIBDVDREAD_IFO_PRINT_H +#define LIBDVDREAD_IFO_PRINT_H #include <inttypes.h> #include "ifo_types.h" @@ -28,7 +28,7 @@ void ifo_print(dvd_reader_t *dvd, int title); void dvdread_print_time(dvd_time_t *dtime); -#endif /* IFO_PRINT_H_INCLUDED */ +#endif /* LIBDVDREAD_IFO_PRINT_H */ /* * $Log$
--- a/ifo_read.h Sun Sep 14 16:00:48 2008 +0000 +++ b/ifo_read.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef IFO_READ_H_INCLUDED -#define IFO_READ_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>, * Håkan Hjort <d95hjort@dtek.chalmers.se> @@ -22,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_IFO_READ_H +#define LIBDVDREAD_IFO_READ_H + #include "ifo_types.h" #include "dvd_reader.h" @@ -226,4 +226,4 @@ #ifdef __cplusplus }; #endif -#endif /* IFO_READ_H_INCLUDED */ +#endif /* LIBDVDREAD_IFO_READ_H */
--- a/ifo_types.h Sun Sep 14 16:00:48 2008 +0000 +++ b/ifo_types.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef IFO_TYPES_H_INCLUDED -#define IFO_TYPES_H_INCLUDED - /* * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>, * Håkan Hjort <d95hjort@dtek.chalmers.se> @@ -22,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_IFO_TYPES_H +#define LIBDVDREAD_IFO_TYPES_H + #include <inttypes.h> #include "dvd_reader.h" @@ -746,4 +746,4 @@ vobu_admap_t *vts_vobu_admap; } ifo_handle_t; -#endif /* IFO_TYPES_H_INCLUDED */ +#endif /* LIBDVDREAD_IFO_TYPES_H */
--- a/md5.h Sun Sep 14 16:00:48 2008 +0000 +++ b/md5.h Sun Sep 14 20:37:38 2008 +0000 @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _MD5_H -#define _MD5_H 1 +#ifndef LIBDVDREAD_MD5_H +#define LIBDVDREAD_MD5_H #include <stdio.h> @@ -158,4 +158,4 @@ # define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) #endif -#endif +#endif /* LIBDVDREAD_MD5_H */
--- a/nav_print.h Sun Sep 14 16:00:48 2008 +0000 +++ b/nav_print.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef NAV_PRINT_H_INCLUDED -#define NAV_PRINT_H_INCLUDED - /* * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>, * Håkan Hjort <d95hjort@dtek.chalmers.se> @@ -22,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_NAV_PRINT_H +#define LIBDVDREAD_NAV_PRINT_H + #include "nav_types.h" /** @@ -49,4 +49,4 @@ #ifdef __cplusplus }; #endif -#endif /* NAV_PRINT_H_INCLUDED */ +#endif /* LIBDVDREAD_NAV_PRINT_H */
--- a/nav_read.h Sun Sep 14 16:00:48 2008 +0000 +++ b/nav_read.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef NAV_READ_H_INCLUDED -#define NAV_READ_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>. * @@ -21,6 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_NAV_READ_H +#define LIBDVDREAD_NAV_READ_H + #include "nav_types.h" /** @@ -50,4 +50,4 @@ #ifdef __cplusplus }; #endif -#endif /* NAV_READ_H_INCLUDED */ +#endif /* LIBDVDREAD_NAV_READ_H */
--- a/nav_types.h Sun Sep 14 16:00:48 2008 +0000 +++ b/nav_types.h Sun Sep 14 20:37:38 2008 +0000 @@ -1,6 +1,3 @@ -#ifndef NAV_TYPES_H_INCLUDED -#define NAV_TYPES_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se> * @@ -28,6 +25,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_NAV_TYPES_H +#define LIBDVDREAD_NAV_TYPES_H + #include <inttypes.h> #include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ @@ -245,4 +245,4 @@ #pragma pack() #endif -#endif /* NAV_TYPES_H_INCLUDED */ +#endif /* LIBDVDREAD_NAV_TYPES_H */