9 files changed, 25 insertions, 36 deletions
diff --git a/lib/libdvd/libdvdread/msvc/include/dlfcn.h b/lib/libdvd/libdvdread/msvc/include/dlfcn.h
index 7a2416c843..b5fe376c34 100755
--- a/lib/libdvd/libdvdread/msvc/include/dlfcn.h
+++ b/lib/libdvd/libdvdread/msvc/include/dlfcn.h
@@ -1,11 +1,6 @@
 #ifndef __DLFCN_H__
 # define __DLFCN_H__
-/*
- * $Id: dlfcn.h 1135 2008-09-06 21:55:51Z rathann $
- * $Name$
- *
- *
- */
+
 extern void *dlopen  (const char *file, int mode);
 extern int   dlclose (void *handle);
 extern void *dlsym   (void * handle, const char * name);
diff --git a/lib/libdvd/libdvdread/msvc/include/dvdnav_internal.h b/lib/libdvd/libdvdread/msvc/include/dvdnav_internal.h
index cee785472e..70ef3e6dfe 100644
--- a/lib/libdvd/libdvdread/msvc/include/dvdnav_internal.h
+++ b/lib/libdvd/libdvdread/msvc/include/dvdnav_internal.h
@@ -14,16 +14,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * $Id: dvdnav_internal.h 1135 2008-09-06 21:55:51Z rathann $
- *
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdnav; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef DVDNAV_INTERNAL_H_INCLUDED
-#define DVDNAV_INTERNAL_H_INCLUDED
+#ifndef LIBDVDREAD_DVDNAV_INTERNAL_H
+#define LIBDVDREAD_DVDNAV_INTERNAL_H
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -182,4 +179,4 @@ struct dvdnav_s {
 #define S_OK  DVDNAV_STATUS_OK
 #endif /* MSC_VER */
 
-#endif /* DVDNAV_INTERNAL_H_INCLUDED */
+#endif /* LIBDVDREAD_DVDNAV_INTERNAL_H */
diff --git a/lib/libdvd/libdvdread/msvc/include/getopt.h b/lib/libdvd/libdvdread/msvc/include/getopt.h
index 2fa12f7baf..5f4643aa9c 100755
--- a/lib/libdvd/libdvdread/msvc/include/getopt.h
+++ b/lib/libdvd/libdvdread/msvc/include/getopt.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+   Floor, Boston, MA 02110-1301 USA.  */
 
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
diff --git a/lib/libdvd/libdvdread/msvc/include/inttypes.h b/lib/libdvd/libdvdread/msvc/include/inttypes.h
index 55fd6a33e0..4e1cbe1efe 100755
--- a/lib/libdvd/libdvdread/msvc/include/inttypes.h
+++ b/lib/libdvd/libdvdread/msvc/include/inttypes.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>
diff --git a/lib/libdvd/libdvdread/msvc/include/os_types.h b/lib/libdvd/libdvdread/msvc/include/os_types.h
index 69f05a8d93..294847ea3f 100755
--- a/lib/libdvd/libdvdread/msvc/include/os_types.h
+++ b/lib/libdvd/libdvdread/msvc/include/os_types.h
@@ -1,9 +1,6 @@
 #ifndef __OS_TYPES_H__
 #define __OS_TYPES_H__
 /*
- * $Id: os_types.h 1135 2008-09-06 21:55:51Z rathann $
- * $Name$
- *
  * win32 types
  * 04 Sept 2001 - Chris Wolf create.
  */
diff --git a/lib/libdvd/libdvdread/msvc/include/pthreads/pthread.h b/lib/libdvd/libdvdread/msvc/include/pthreads/pthread.h
index 7b89ca8401..202bc001c9 100755
--- a/lib/libdvd/libdvdread/msvc/include/pthreads/pthread.h
+++ b/lib/libdvd/libdvdread/msvc/include/pthreads/pthread.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
  */
 
 #if !defined( PTHREAD_H )
@@ -196,7 +196,7 @@ extern "C"
  *                              pthread_attr_setstackaddr
  *
  * _POSIX_THREAD_PRIORITY_SCHEDULING (set)
- *                      If set, you can use realtime scheduling.
+ *                      If set, you can use real-time scheduling.
  *                      Indicates the availability of:
  *                              pthread_attr_getinheritsched
  *                              pthread_attr_getschedparam
@@ -393,7 +393,7 @@ enum {
   PTHREAD_SCOPE_SYSTEM		= 1,  /* Default */
 
 /*
- * pthread_setcancelstate paramters
+ * pthread_setcancelstate parameters
  */
   PTHREAD_CANCEL_ENABLE		= 0,  /* Default */
   PTHREAD_CANCEL_DISABLE	= 1,
@@ -420,7 +420,7 @@ enum {
 /*
  * ====================
  * ====================
- * Cancelation
+ * Cancellation
  * ====================
  * ====================
  */
diff --git a/lib/libdvd/libdvdread/msvc/include/pthreads/sched.h b/lib/libdvd/libdvdread/msvc/include/pthreads/sched.h
index ab277920e0..d7596b292d 100755
--- a/lib/libdvd/libdvdread/msvc/include/pthreads/sched.h
+++ b/lib/libdvd/libdvdread/msvc/include/pthreads/sched.h
@@ -22,8 +22,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
  */
 #ifndef _SCHED_H
 #define _SCHED_H
diff --git a/lib/libdvd/libdvdread/msvc/include/sys/time.h b/lib/libdvd/libdvdread/msvc/include/sys/time.h
index f874fa655f..fe7fd84504 100755
--- a/lib/libdvd/libdvdread/msvc/include/sys/time.h
+++ b/lib/libdvd/libdvdread/msvc/include/sys/time.h
@@ -14,13 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>
  *
- * sys/time.h - There is no seperate sys/time.h for win32 so we simply
+ * sys/time.h - There is no separate sys/time.h for win32 so we simply
  *              include the standard time header as well as our xine
  *				timer functions.
  */
diff --git a/lib/libdvd/libdvdread/msvc/include/unistd.h b/lib/libdvd/libdvdread/msvc/include/unistd.h
index 7e4c63f3a5..9292fee2e5 100755
--- a/lib/libdvd/libdvdread/msvc/include/unistd.h
+++ b/lib/libdvd/libdvdread/msvc/include/unistd.h
@@ -14,14 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>
  *
  * unistd.h - This is mostly a catch all header that maps standard unix
- *            libc calls to the equivelent win32 functions.
+ *            libc calls to the equivalent win32 functions.
  *
  */
 
@@ -63,7 +63,7 @@
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 
-// FIXME : I dont remember why this is here
+// FIXME : I don't remember why this is here
 #define readlink
 
 #endif