ref: 99febf7d3f6b71751a42930a3a01364c91e3fd83
parent: 73a1d090593af7bdb3756abf80e2bb6950635a15
author: Diego Biurrun <diego@biurrun.de>
date: Mon Sep 17 08:10:20 EDT 2007
Identifiers starting with two underscores or an underscore and capital letters are reserved for the system in C.
--- a/src/bsdi_dvd.h
+++ b/src/bsdi_dvd.h
@@ -2,8 +2,8 @@
* $Id$
*/
-#ifndef _DVD_H_
-#define _DVD_H_
+#ifndef DVDCSS_DVD_H
+#define DVDCSS_DVD_H
#include <sys/cdefs.h>
#include <machine/endian.h>
@@ -341,4 +341,4 @@
int error;
} tracktype;
-#endif /* _DVD_H_ */
+#endif /* DVDCSS_DVD_H */
--- a/src/dvdcss/dvdcss.h
+++ b/src/dvdcss/dvdcss.h
@@ -27,9 +27,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#ifndef _DVDCSS_DVDCSS_H
+#ifndef DVDCSS_DVDCSS_H
#ifndef _DOXYGEN_SKIP_ME
-#define _DVDCSS_DVDCSS_H 1
+#define DVDCSS_DVDCSS_H 1
#endif
#ifdef __cplusplus
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -243,7 +243,7 @@
UCHAR LayerNumber;
} DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE;
-typedef struct _DVD_COPYRIGHT_DESCRIPTOR {+typedef struct DVD_COPYRIGHT_DESCRIPTOR {UCHAR CopyrightProtectionType;
UCHAR RegionManagementInformation;
USHORT Reserved;
@@ -262,7 +262,7 @@
DvdInvalidateAGID = 0x3f
} DVD_KEY_TYPE;
-typedef struct _DVD_COPY_PROTECT_KEY
+typedef struct DVD_COPY_PROTECT_KEY
{ULONG KeyLength;
DVD_SESSION_ID SessionId;
@@ -280,7 +280,7 @@
UCHAR KeyData[0];
} DVD_COPY_PROTECT_KEY, *PDVD_COPY_PROTECT_KEY;
-typedef struct _DVD_ASF
+typedef struct DVD_ASF
{UCHAR Reserved0[3];
UCHAR SuccessFlag:1;
@@ -287,7 +287,7 @@
UCHAR Reserved1:7;
} DVD_ASF, * PDVD_ASF;
-typedef struct _DVD_RPC_KEY
+typedef struct DVD_RPC_KEY
{UCHAR UserResetsAvailable:3;
UCHAR ManufacturerResetsAvailable:3;
@@ -297,7 +297,7 @@
UCHAR Reserved2[1];
} DVD_RPC_KEY, * PDVD_RPC_KEY;
-typedef struct _SCSI_PASS_THROUGH_DIRECT
+typedef struct SCSI_PASS_THROUGH_DIRECT
{USHORT Length;
UCHAR ScsiStatus;