Mercurial > mplayer.hg

changeset 24535:b015cbd37591

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Leading underscores in identifiers are reserved in C.
author diego
date Mon, 17 Sep 2007 13:08:51 +0000
parents 2273bfbb8e40
children b033836ecfb9
files libdvdcss/bsdi_dvd.h libdvdcss/dvdcss/dvdcss.h libdvdcss/ioctl.h
diffstat 3 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libdvdcss/bsdi_dvd.h	Mon Sep 17 13:07:06 2007 +0000
+++ b/libdvdcss/bsdi_dvd.h	Mon Sep 17 13:08:51 2007 +0000
@@ -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/libdvdcss/dvdcss/dvdcss.h	Mon Sep 17 13:07:06 2007 +0000
+++ b/libdvdcss/dvdcss/dvdcss.h	Mon Sep 17 13:08:51 2007 +0000
@@ -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/libdvdcss/ioctl.h	Mon Sep 17 13:07:06 2007 +0000
+++ b/libdvdcss/ioctl.h	Mon Sep 17 13:08:51 2007 +0000
@@ -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,14 +280,14 @@
     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 @@
     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;