Redo the filters based on assumptions discussed in mingw-dvlpr list.

[mingw/mingw-org-wsl.git] / include / rasdlg.h

diff --git a/include/rasdlg.h b/include/rasdlg.h
index 25be2fe..cd2926d 100644 (file)
--- a/include/rasdlg.h
+++ b/include/rasdlg.h
@@ -1,6 +1,30 @@
+/**
+ * @file rasdlg.h
+ * @copy 2012 MinGW.org project
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _RASDLG_H
 #define _RASDLG_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -126,25 +150,17 @@ BOOL APIENTRY RasEntryDlgW(LPWSTR,LPWSTR,LPRASENTRYDLGW);
 BOOL APIENTRY RasPhonebookDlgA(LPSTR,LPSTR,LPRASPBDLGA);
 BOOL APIENTRY RasPhonebookDlgW(LPWSTR,LPWSTR,LPRASPBDLGW);
 
-#ifdef UNICODE
-typedef RASENTRYDLGW   RASENTRYDLG, *LPRASENTRYDLG;
-typedef RASPBDLGW      RASPBDLG, *LPRASPBDLG;
-typedef RASNOUSERW     RASNOUSER, *LPRASNOUSER;
-#define RasDialDlg     RasDialDlgW
-#define RasEntryDlg    RasEntryDlgW
-#define RasPhonebookDlg        RasPhonebookDlgW
-#else
-typedef RASENTRYDLGA   RASENTRYDLG, *LPRASENTRYDLG;
-typedef RASPBDLGA      RASPBDLG, *LPRASPBDLG;
-typedef RASNOUSERA     RASNOUSER, *LPRASNOUSER;
-#define RasDialDlg     RasDialDlgA
-#define RasEntryDlg    RasEntryDlgA
-#define RasPhonebookDlg        RasPhonebookDlgA
-#endif /* UNICODE */
+typedef __AW(RASENTRYDLG)      RASENTRYDLG, *LPRASENTRYDLG;
+typedef __AW(RASPBDLG) RASPBDLG, *LPRASPBDLG;
+typedef __AW(RASNOUSER)        RASNOUSER, *LPRASNOUSER;
+#define RasDialDlg     __AW(RasDialDlg)
+#define RasEntryDlg    __AW(RasEntryDlg)
+#define RasPhonebookDlg        __AW(RasPhonebookDlg)
 
 #endif /* RC_INVOKED */
 
 #ifdef __cplusplus
 }
 #endif
+
 #endif