From dd1244207243e9d5fdeb1272701a311284ce14e6 Mon Sep 17 00:00:00 2001
From: Robert Dickenson <robd@reactos.org>
Date: Sun, 8 Dec 2002 16:18:30 +0000
Subject: [PATCH] typos, reduce mingw header diffs, extra includes.

svn path=/trunk/; revision=3835
---
 reactos/include/ddk/ntddbeep.h    |  3 ++
 reactos/include/ddk/ntddkbd.h     | 46 +++++++++++++++++++++++++++++--
 reactos/include/excpt.h           | 10 +++----
 reactos/include/kernel32/winnls.h |  8 +++---
 reactos/include/tchar.h           |  8 +++---
 5 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/reactos/include/ddk/ntddbeep.h b/reactos/include/ddk/ntddbeep.h
index 2663ecd4d1d..1fa4630dfd3 100644
--- a/reactos/include/ddk/ntddbeep.h
+++ b/reactos/include/ddk/ntddbeep.h
@@ -31,6 +31,7 @@
 extern "C" {
 #endif
 
+#pragma pack(push,4)
 
 #define IOCTL_BEEP_SET \
   CTL_CODE(FILE_DEVICE_BEEP,0,METHOD_BUFFERED,FILE_ANY_ACCESS)
@@ -43,6 +44,8 @@ typedef struct tagBEEP_SET_PARAMETERS {
 #define BEEP_FREQUENCY_MINIMUM  0x25
 #define BEEP_FREQUENCY_MAXIMUM  0x7FFF
 
+#pragma pack(pop)
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/reactos/include/ddk/ntddkbd.h b/reactos/include/ddk/ntddkbd.h
index 527392c900c..fa903f35dc9 100644
--- a/reactos/include/ddk/ntddkbd.h
+++ b/reactos/include/ddk/ntddkbd.h
@@ -1,5 +1,38 @@
-#ifndef _NTDDKBD_
-#define _NTDDKBD_
+/*
+ * ntddkbd.h
+ *
+ * Keyboard IOCTL interface
+ *
+ * This file is part of the MinGW package.
+ *
+ * Contributors:
+ *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifndef __NTDDKBD_H
+#define __NTDDKBD_H
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#pragma pack(push,4)
+
 
 typedef struct _KEYBOARD_INPUT_DATA {
 
@@ -16,4 +49,11 @@ typedef struct _KEYBOARD_INPUT_DATA {
 
 } KEYBOARD_INPUT_DATA, *PKEYBOARD_INPUT_DATA;
 
-#endif 						// _NTDDKBD_
+
+#pragma pack(pop)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __NTDDKBD_H */
diff --git a/reactos/include/excpt.h b/reactos/include/excpt.h
index 4047ef2eb34..e627d00c7bb 100644
--- a/reactos/include/excpt.h
+++ b/reactos/include/excpt.h
@@ -19,12 +19,12 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
- * $Author: chorns $
- * $Date: 2002/09/08 10:22:26 $
+ * $Revision: 1.4 $
+ * $Author: robd $
+ * $Date: 2002/12/08 16:18:29 $
  *
  */
 
@@ -96,7 +96,7 @@ typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD;
 
 
 /*
- * A macro which (dispite its name) *removes* an installed
+ * A macro which (despite its name) *removes* an installed
  * exception handler. Should be used only in conjunction with the above
  * install routine __try1.
  * Move the pointer to the old reg. struct (at the current stack
diff --git a/reactos/include/kernel32/winnls.h b/reactos/include/kernel32/winnls.h
index b293529f44b..d07a3ba7711 100644
--- a/reactos/include/kernel32/winnls.h
+++ b/reactos/include/kernel32/winnls.h
@@ -151,12 +151,12 @@
 #define SUBLANGID(l)		((WORD)(l) >> 10)
 #endif
 
-#if 0
+#ifdef _KERNEL32_INCLUDE_LANG_
 #define LANG_SYSTEM_DEFAULT	(MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT))
 #define LANG_USER_DEFAULT	(MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT))
-#define LOCALE_SYSTEM_DEFAULT	(MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
-#define LOCALE_USER_DEFAULT	(MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) 
-#define LOCALE_NEUTRAL		(MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT))
+//#define LOCALE_SYSTEM_DEFAULT	(MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
+//#define LOCALE_USER_DEFAULT	(MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) 
+//#define LOCALE_NEUTRAL		(MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT))
 #endif
 
 /* Language IDs (were in winnt.h,  for some reason) */
diff --git a/reactos/include/tchar.h b/reactos/include/tchar.h
index e108dd721d6..60528386497 100644
--- a/reactos/include/tchar.h
+++ b/reactos/include/tchar.h
@@ -26,12 +26,12 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
- * $Author: chorns $
- * $Date: 2002/09/08 10:22:28 $
+ * $Revision: 1.4 $
+ * $Author: robd $
+ * $Date: 2002/12/08 16:18:29 $
  *
  */