Alexandre Julliard : include: Prevent internal Wine headers from being used in tests.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 35e59151e94d93014f9fc88ee4b51af852a4c206
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=35e59151e94d93014f9fc88e...

Author: Alexandre Julliard 
Date:   Thu May 25 20:07:57 2006 +0200

include: Prevent internal Wine headers from being used in tests.

---

include/wine/debug.h   |    4 ++++
 include/wine/library.h |    4 ++++
 include/wine/test.h    |   16 +++++++++++++---
 include/wine/unicode.h |   10 +++++++---
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/include/wine/debug.h b/include/wine/debug.h
index 8ad0f83..18de451 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -27,6 +27,10 @@ #ifndef GUID_DEFINED
 #include <guiddef.h>
 #endif

+#ifdef __WINE_WINE_TEST_H
+#error This file should not be used in Wine tests
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/wine/library.h b/include/wine/library.h
index 76b19d8..c593bd2 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -27,6 +27,10 @@ #include <sys/types.h>
 #include <windef.h>
 #include <winbase.h>

+#ifdef __WINE_WINE_TEST_H
+#error This file should not be used in Wine tests
+#endif
+
 /* configuration */

extern const char *wine_get_build_dir(void);
diff --git a/include/wine/test.h b/include/wine/test.h
index 686040a..f3793f3 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -18,14 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#ifndef __WINE_TEST_H
-#define __WINE_TEST_H
+#ifndef __WINE_WINE_TEST_H
+#define __WINE_WINE_TEST_H

#include <stdarg.h>
 #include <stdlib.h>
 #include <windef.h>
 #include <winbase.h>

+#ifdef __WINE_WINE_LIBRARY_H
+#error wine/library.h should not be used in Wine tests
+#endif
+#ifdef __WINE_WINE_UNICODE_H
+#error wine/unicode.h should not be used in Wine tests
+#endif
+#ifdef __WINE_WINE_DEBUG_H
+#error wine/debug.h should not be used in Wine tests
+#endif
+
 /* debug level */
 extern int winetest_debug;

@@ -403,4 +413,4 @@ int main( int argc, char **argv )

#endif  /* STANDALONE */

-#endif  /* __WINE_TEST_H */
+#endif  /* __WINE_WINE_TEST_H */
diff --git a/include/wine/unicode.h b/include/wine/unicode.h
index 34ae52b..704d88a 100644
--- a/include/wine/unicode.h
+++ b/include/wine/unicode.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#ifndef __WINE_UNICODE_H
-#define __WINE_UNICODE_H
+#ifndef __WINE_WINE_UNICODE_H
+#define __WINE_WINE_UNICODE_H

#include <stdarg.h>

@@ -27,6 +27,10 @@ #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>

+#ifdef __WINE_WINE_TEST_H
+#error This file should not be used in Wine tests
+#endif
+
 #ifndef WINE_UNICODE_API
 #define WINE_UNICODE_API DECLSPEC_IMPORT
 #endif
@@ -284,4 +288,4 @@ extern inline int atoiW( const WCHAR *st
     return (int)atolW( str );
 }

-#endif  /* __WINE_UNICODE_H */
+#endif  /* __WINE_WINE_UNICODE_H */