[MPlayer-cvslog] r24555 - in trunk/libdvdcss: bsdi_dvd.h dvdcss/dvdcss.h ioctl.h

[diego]

Author: diego
Date: Mon Sep 17 15:08:51 2007
New Revision: 24555

Log:
Leading underscores in identifiers are reserved in C.


Modified:
   trunk/libdvdcss/bsdi_dvd.h
   trunk/libdvdcss/dvdcss/dvdcss.h
   trunk/libdvdcss/ioctl.h

Modified: trunk/libdvdcss/bsdi_dvd.h
==============================================================================
--- trunk/libdvdcss/bsdi_dvd.h	(original)
+++ trunk/libdvdcss/bsdi_dvd.h	Mon Sep 17 15:08:51 2007
@@ -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 */

Modified: trunk/libdvdcss/dvdcss/dvdcss.h
==============================================================================
--- trunk/libdvdcss/dvdcss/dvdcss.h	(original)
+++ trunk/libdvdcss/dvdcss/dvdcss.h	Mon Sep 17 15:08:51 2007
@@ -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

Modified: trunk/libdvdcss/ioctl.h
==============================================================================
--- trunk/libdvdcss/ioctl.h	(original)
+++ trunk/libdvdcss/ioctl.h	Mon Sep 17 15:08:51 2007
@@ -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;