# HG changeset patch # User diego # Date 1161711011 0 # Node ID 8e6981e8f50a731809f9c799b46ae57eb2f5668e # Parent 06a95dbdacc53efb7b6f33da2db78568bdeff444 Sync cosmetics from upstream libdvdcss. diff -r 06a95dbdacc5 -r 8e6981e8f50a libmpdvdkit2/common.h --- a/libmpdvdkit2/common.h Tue Oct 24 16:24:48 2006 +0000 +++ b/libmpdvdkit2/common.h Tue Oct 24 17:30:11 2006 +0000 @@ -49,13 +49,13 @@ #if defined( WIN32 ) -#ifndef PATH_MAX -# define PATH_MAX MAX_PATH -#endif +# ifndef PATH_MAX +# define PATH_MAX MAX_PATH +# endif /* several type definitions */ # if defined( __MINGW32__ ) -#define lseek _lseeki64 +# define lseek _lseeki64 # if !defined( _OFF_T_ ) typedef long long _off_t; typedef _off_t off_t; diff -r 06a95dbdacc5 -r 8e6981e8f50a libmpdvdkit2/device.h --- a/libmpdvdkit2/device.h Tue Oct 24 16:24:48 2006 +0000 +++ b/libmpdvdkit2/device.h Tue Oct 24 17:30:11 2006 +0000 @@ -44,9 +44,9 @@ /***************************************************************************** * Device reading prototypes *****************************************************************************/ -int _dvdcss_use_ioctls ( dvdcss_t ); -int _dvdcss_open ( dvdcss_t ); -int _dvdcss_close ( dvdcss_t ); +int _dvdcss_use_ioctls ( dvdcss_t ); +int _dvdcss_open ( dvdcss_t ); +int _dvdcss_close ( dvdcss_t ); /***************************************************************************** * Device reading prototypes, raw-device specific diff -r 06a95dbdacc5 -r 8e6981e8f50a libmpdvdkit2/libdvdcss.c --- a/libmpdvdkit2/libdvdcss.c Tue Oct 24 16:24:48 2006 +0000 +++ b/libmpdvdkit2/libdvdcss.c Tue Oct 24 17:30:11 2006 +0000 @@ -159,7 +159,7 @@ * and when possible, the disc key is retrieved. * * dvdcss_open() returns a handle to be used for all subsequent \e libdvdcss - * calls. If an error occured, NULL is returned. + * calls. If an error occurred, NULL is returned. */ extern dvdcss_t dvdcss_open ( char *psz_target ) { @@ -550,14 +550,14 @@ } /** - * \brief Return a string containing the latest error that occured in the + * \brief Return a string containing the latest error that occurred in the * given \e libdvdcss instance. * * \param dvdcss a \e libdvdcss instance. * \return a null-terminated string containing the latest error message. * * This function returns a constant string containing the latest error that - * occured in \e libdvdcss. It can be used to format error messages at your + * occurred in \e libdvdcss. It can be used to format error messages at your * convenience in your application. */ extern char * dvdcss_error ( dvdcss_t dvdcss )