[ros-diffs] [tkreuzer] 46538: Apply MSVC compilation fix.

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Mon Mar 29 01:32:29 2010
New Revision: 46538

URL: http://svn.reactos.org/svn/reactos?rev=46538&view=rev
Log:
Apply MSVC compilation fix.

Modified:
    branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h
    branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h
    branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff
    branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h

Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h?rev=46538&r1=46537&r2=46538&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Mon Mar 29 01:32:29 2010
@@ -35,6 +35,12 @@
 #define __IOINFO_TM_UTF8 1
 #define __IOINFO_TM_UTF16LE 2
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4214)
+#pragma warning(disable:4820)
+#endif
+
   typedef struct {
     intptr_t osfhnd;
     char osfile;
@@ -45,6 +51,10 @@
     char unicode : 1;
     char pipech2[2];
   } ioinfo;
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #define IOINFO_ARRAY_ELTS (1 << 5)
 

Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h?rev=46538&r1=46537&r2=46538&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Mon Mar 29 01:32:29 2010
@@ -30,6 +30,11 @@
 #endif
 #endif
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4214)
+#endif
+
 typedef struct _FTIME
 {
   unsigned short twosecs : 5;
@@ -46,6 +51,10 @@
   unsigned short year : 7;
 } FDATE;
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 typedef FDATE *PFDATE;
 
 #endif

Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff?rev=46538&r1=46537&r2=46538&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] Mon Mar 29 01:32:29 2010
@@ -1,8 +1,8 @@
 Index: internal.h
 ===================================================================
---- internal.h	(Revision 43956)
+--- internal.h	(Revision 46537)
 +++ internal.h	(Arbeitskopie)
-@@ -32,6 +32,12 @@
+@@ -35,6 +35,12 @@
  #define __IOINFO_TM_UTF8 1
  #define __IOINFO_TM_UTF16LE 2
  
@@ -15,7 +15,7 @@
    typedef struct {
      intptr_t osfhnd;
      char osfile;
-@@ -43,6 +49,10 @@
+@@ -46,6 +52,10 @@
      char pipech2[2];
    } ioinfo;
  
@@ -28,7 +28,7 @@
  #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1)))
 Index: oscalls.h
 ===================================================================
---- oscalls.h	(Revision 43956)
+--- oscalls.h	(Revision 46537)
 +++ oscalls.h	(Arbeitskopie)
 @@ -30,6 +30,11 @@
  #endif
@@ -55,7 +55,7 @@
  #endif
 Index: sect_attribs.h
 ===================================================================
---- sect_attribs.h	(Revision 43956)
+--- sect_attribs.h	(Revision 46537)
 +++ sect_attribs.h	(Arbeitskopie)
 @@ -10,7 +10,7 @@
  #define _ATTRIBUTES shared

Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h?rev=46538&r1=46537&r2=46538&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Mon Mar 29 01:32:29 2010
@@ -10,7 +10,7 @@
 #define _ATTRIBUTES shared
 #endif
 
-#if 0
+#if defined(_MSC_VER)
 /* Reference list of existing section for msvcrt.  */
 #pragma section(".CRTMP$XCA",long,_ATTRIBUTES)
 #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES)
@@ -55,6 +55,14 @@
 #pragma section(".rtc$IZZ",long,read)
 #pragma section(".rtc$TAA",long,read)
 #pragma section(".rtc$TZZ",long,read)
+#pragma section(".tls",long,read,write)
+#pragma section(".tls$ZZZ",long,read,write)
 #endif
 
+#if defined(_MSC_VER)
+#define _CRTALLOC(x) __declspec(allocate(x))
+#elif defined(__GNUC__)
 #define _CRTALLOC(x) __attribute__ ((section (x) ))
+#else
+#error
+#endif