Changeset 21975 for trunk/include/win

Timestamp:

Feb 21, 2012, 8:53:47 PM (14 years ago)

Author:

dmik

Message:

winnls.h: Don't hide Windows defines when os2wrap2.h is included.

File:

• trunk/include/win/winnls.h (modified) (3 diffs)

trunk/include/win/winnls.h

@@ -438 +438 @@
 typedef DWORD CALID;
 
-
-#ifndef OS2_INCLUDED
+#if !(defined(OS2_INCLUDED) && !defined(OS2_WRAP_INCLUDED))
 
 /* Define a bunch of callback types */
@@ -559 +558 @@
 /* APIs
  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 UINT        WINAPI CompareStringA(LCID,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
@@ -637 +632 @@
 INT         WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif //#ifndef OS2_INCLUDED
+#endif  /* !(defined(OS2_INCLUDED) && !defined(OS2_WRAP_INCLUDED)) */
 
 #endif  /* __WINE_WINNLS_H */