[ros-diffs] [hbelusca] 73736: [BOOTLIB]: Make the EfiPrintf with __FUNCTION__ work also on GCC. Also, on MSVC (2010 at least), concatenating without converting __FUNCTION__ to unicode and adding 'L' for the "\...

Author: hbelusca
Date: Mon Feb  6 22:46:57 2017
New Revision: 73736

URL: http://svn.reactos.org/svn/reactos?rev=73736&view=rev
Log:
[BOOTLIB]: Make the EfiPrintf with __FUNCTION__ work also on GCC. Also, on MSVC (2010 at
least), concatenating without converting __FUNCTION__ to unicode and adding 'L'
for the "\r\n" returned error C2308.

Modified:
    trunk/reactos/boot/environ/lib/mm/mm.c
    trunk/reactos/boot/environ/lib/mm/pagealloc.c

Modified: trunk/reactos/boot/environ/lib/mm/mm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r…
==============================================================================
--- trunk/reactos/boot/environ/lib/mm/mm.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/environ/lib/mm/mm.c	[iso-8859-1] Mon Feb  6 22:46:57 2017
@@ -146,10 +146,8 @@
     }
 
     /* We don't support virtual memory yet @TODO */
-#ifdef _MSC_VER // Fuck gcc.
-    EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n");
+    EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
     EfiStall(1000000);
-#endif
     return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -189,10 +187,8 @@
     }
 
     /* We don't support virtual memory yet @TODO */
-#ifdef _MSC_VER // Fuck gcc.
-    EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n");
+    EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
     EfiStall(1000000);
-#endif
     return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -281,10 +277,8 @@
     if (MmTranslationType != BlNone)
     {
         /* We don't support virtual memory yet @TODO */
-#ifdef _MSC_VER // Fuck gcc.
-        EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n");
+        EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
         EfiStall(1000000);
-#endif
         Status = STATUS_NOT_IMPLEMENTED;
         goto Quickie;
     }
@@ -319,10 +313,8 @@
         else
         {
             /* We don't support virtual memory yet @TODO */
-#ifdef _MSC_VER // Fuck gcc.
-            EfiPrintf(L"not yet implemented in " __FUNCTION__
"\r\n");
+            EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
             EfiStall(1000000);
-#endif
             Status = STATUS_NOT_IMPLEMENTED;
         }
     }
@@ -357,10 +349,8 @@
         if ((NT_SUCCESS(Status)) && (MmTranslationType != BlNone))
         {
             /* We don't support virtual memory yet @TODO */
-#ifdef _MSC_VER // Fuck gcc.
-            EfiPrintf(L"not yet implemented in " __FUNCTION__
"\r\n");
+            EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
             EfiStall(1000000);
-#endif
             Status = STATUS_NOT_IMPLEMENTED;
         }
     }

Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal…
==============================================================================
--- trunk/reactos/boot/environ/lib/mm/pagealloc.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/environ/lib/mm/pagealloc.c	[iso-8859-1] Mon Feb  6 22:46:57 2017
@@ -188,10 +188,8 @@
     /* Are we allocating from the virtual memory list? */
     if (CurrentList == &MmMdlMappedUnallocated)
     {
-#ifdef _MSC_VER // Fuck gcc.
-        EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n");
+        EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
         EfiStall(1000000);
-#endif
         return STATUS_NOT_IMPLEMENTED;
     }
 
@@ -443,10 +441,8 @@
     if (MmTranslationType != BlNone)
     {
         /* We don't support virtual memory yet @TODO */
-#ifdef _MSC_VER // Fuck gcc.
-        EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n");
+        EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__);
         EfiStall(1000000);
-#endif
         Status = STATUS_NOT_IMPLEMENTED;
         goto Exit;
     }