Stefan Leichter : rasapi32: Fix building the tests with MSVC ( based on a patch by Reece Dunn).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cc494c48af86c72d6265269aa81cbd98318a0cec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cc494c48af86c72d6265269aa8...

Author: Stefan Leichter 
Date:   Sat Jul 26 10:29:34 2008 +0200

rasapi32: Fix building the tests with MSVC (based on a patch by Reece Dunn).

---

dlls/rasapi32/rasapi.c       |    1 +
 dlls/rasapi32/tests/rasapi.c |    1 +
 include/Makefile.in          |    1 +
 include/ras.h                |    4 ----
 include/raserror.h           |   26 ++++++++++++++++++++++++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c
index f14694a..704a8bc 100644
--- a/dlls/rasapi32/rasapi.c
+++ b/dlls/rasapi32/rasapi.c
@@ -23,6 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "ras.h"
+#include "raserror.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(ras);
diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c
index 4130392..94026ab 100644
--- a/dlls/rasapi32/tests/rasapi.c
+++ b/dlls/rasapi32/tests/rasapi.c
@@ -24,6 +24,7 @@
 #include <windef.h>
 #include <winbase.h>
 #include "ras.h"
+#include "raserror.h"

static HMODULE hmodule;
 static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD);
diff --git a/include/Makefile.in b/include/Makefile.in
index 99b06d9..882d89d 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -350,6 +350,7 @@ SRCDIR_INCLUDES = \
    pshpack4.h \
    pshpack8.h \
    ras.h \
+	raserror.h \
    reason.h \
    regstr.h \
    richedit.h \
diff --git a/include/ras.h b/include/ras.h
index 82efcda..f90d25a 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -55,10 +55,6 @@ extern "C" {
 #define RASDT_Parallel   "PARALLEL"
 #define RASDT_PPPoE      "PPPoE"

-#define RASBASE				600
-#define ERROR_BUFFER_TOO_SMALL		(RASBASE+3)
-#define ERROR_INVALID_SIZE		(RASBASE+32)
-
 typedef struct tagRASDEVINFOA {
     DWORD    dwSize;
     CHAR     szDeviceType[ RAS_MaxDeviceType + 1 ];
diff --git a/include/raserror.h b/include/raserror.h
new file mode 100644
index 0000000..e0f7d44
--- /dev/null
+++ b/include/raserror.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2008 Stefan Leichter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_RASERROR_H
+#define __WINE_RASERROR_H
+
+#define RASBASE                                600
+#define ERROR_BUFFER_TOO_SMALL                 (RASBASE+3)
+#define ERROR_INVALID_SIZE                     (RASBASE+32)
+
+#endif