summaryrefslogtreecommitdiffstats
path: root/libdvdcss
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-17 13:08:51 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-17 13:08:51 +0000
commitabf8510716dd4eec393791a2034d0ecb66b3896c (patch)
tree430d2feec4fcdf8c15dd0a40cf577d814b76a591 /libdvdcss
parentfd670000d98145d3a13ec1582ffdd920a3db6599 (diff)
downloadmpv-abf8510716dd4eec393791a2034d0ecb66b3896c.tar.bz2
mpv-abf8510716dd4eec393791a2034d0ecb66b3896c.tar.xz
Leading underscores in identifiers are reserved in C.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24555 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdvdcss')
-rw-r--r--libdvdcss/bsdi_dvd.h6
-rw-r--r--libdvdcss/dvdcss/dvdcss.h4
-rw-r--r--libdvdcss/ioctl.h10
3 files changed, 10 insertions, 10 deletions
diff --git a/libdvdcss/bsdi_dvd.h b/libdvdcss/bsdi_dvd.h
index 850504a064..f4c8b89f6d 100644
--- a/libdvdcss/bsdi_dvd.h
+++ b/libdvdcss/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 @@ typedef struct
int error;
} tracktype;
-#endif /* _DVD_H_ */
+#endif /* DVDCSS_DVD_H */
diff --git a/libdvdcss/dvdcss/dvdcss.h b/libdvdcss/dvdcss/dvdcss.h
index bf7bbeeeb7..b27b5811da 100644
--- a/libdvdcss/dvdcss/dvdcss.h
+++ b/libdvdcss/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
diff --git a/libdvdcss/ioctl.h b/libdvdcss/ioctl.h
index 15595e2569..aa33b50ba1 100644
--- a/libdvdcss/ioctl.h
+++ b/libdvdcss/ioctl.h
@@ -243,7 +243,7 @@ typedef struct DVD_READ_STRUCTURE {
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 @@ typedef enum
DvdInvalidateAGID = 0x3f
} DVD_KEY_TYPE;
-typedef struct _DVD_COPY_PROTECT_KEY
+typedef struct DVD_COPY_PROTECT_KEY
{
ULONG KeyLength;
DVD_SESSION_ID SessionId;
@@ -280,14 +280,14 @@ typedef struct _DVD_COPY_PROTECT_KEY
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;
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 @@ typedef struct _DVD_RPC_KEY
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;