[ros-diffs] [hyperion] 37051: modified crt1.c Translated inline assembler in __mingw_CRTStartup mingw_main now compiles with Visual C++ modified mingw.rbuild deleted strcasecmp.c deleted strncasecmp.c deleted wcscmpi.c strcasecmp, strncasecmp and wcscmpi are inlined in MinGW headers, no need to define them as library functions

Author: hyperion
Date: Wed Oct 29 08:03:03 2008
New Revision: 37051

URL: http://svn.reactos.org/svn/reactos?rev=37051&view=rev
Log:
modified   crt1.c
   Translated inline assembler in __mingw_CRTStartup
   mingw_main now compiles with Visual C++

modified   mingw.rbuild
deleted    strcasecmp.c
deleted    strncasecmp.c
deleted    wcscmpi.c
   strcasecmp, strncasecmp and wcscmpi are inlined in MinGW headers, no need to define
them as library functions

Removed:
    branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c
    branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c
    branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c
Modified:
    branches/the-real-msvc/lib/3rdparty/mingw/crt1.c
    branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild

Modified: branches/the-real-msvc/lib/3rdparty/mingw/crt1.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/mingw/crt1.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/mingw/crt1.c [iso-8859-1] Wed Oct 29 08:03:03
2008
@@ -220,6 +220,7 @@
   _pei386_runtime_relocator ();
 #endif
 
+#if defined(__GNUC__)
 #if defined(__i386__)
   /* Align the stack to 16 bytes for the sake of SSE ops in main
      or in functions inlined into main.  */
@@ -233,6 +234,17 @@
 #else
 #error Unsupported architecture
 #endif
+#elif defined(_MSC_VER)
+#if defined(_M_IX86)
+  /* Align the stack to 16 bytes for the sake of SSE ops in main
+     or in functions inlined into main.  */
+  __asm and esp, 0FFFFFFF0h
+#else
+#error TODO
+#endif
+#else
+#error TODO
+#endif
 
   /*
    * Call the main function. If the user does not supply one

Modified: branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Oct 29
08:03:03 2008
@@ -13,10 +13,7 @@
 	<file>isascii.c</file>
 	<file>iscsym.c</file>
 	<file>iscsymf.c</file>
-	<file>strcasecmp.c</file>
-	<file>strncasecmp.c</file>
 	<file>toascii.c</file>
-	<file>wcscmpi.c</file>
 	<file>_wgetopt.c</file>
 	<if property="ARCH" value="i386">
 		<file>pseudo-reloc.c</file>

Removed: branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/mingw/strcasecmp.c (removed)
@@ -1,21 +1,0 @@
-/*
- * strcasecmp.c
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
- *
- * Oldnames from ANSI header string.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- */
-
-#include <string.h>
-
-int
-strcasecmp (const char *sz1, const char *sz2)
-{
-  return _stricmp (sz1, sz2);
-}
-

Removed: branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/mingw/strncasecmp.c (removed)
@@ -1,21 +1,0 @@
-/*
- * strncasecmp.c
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
- *
- * Oldnames from ANSI header string.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- */
-
-#include <string.h>
-
-int
-strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare)
-{
-  return _strnicmp (sz1, sz2, sizeMaxCompare);
-}
-

Removed: branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming…
==============================================================================
--- branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/3rdparty/mingw/wcscmpi.c (removed)
@@ -1,21 +1,0 @@
-/*
- * wcscmpi.c
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
- *
- * Oldnames from ANSI header string.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- */
-
-#include <string.h>
-
-int
-wcscmpi (const wchar_t * ws1, const wchar_t * ws2)
-{
-  return _wcsicmp (ws1, ws2);
-}
-