update code style (dotnet#1285)

tonerdo · Nov 21, 2017 · 474dd62 · 474dd62
1 parent 0c3b863
commit 474dd62
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/Native/Bootstrap/main.cpp b/src/Native/Bootstrap/main.cpp
@@ -361,11 +361,7 @@ int main(int argc, char* argv[])
     try
 #endif
     {
-#ifndef CORERT_DLL
         retval = __managed__Main(argc, argv);
-#else
-        retval = 0;
-#endif // !CORERT_DLL
     }
 #ifdef CPPCODEGEN
     catch (const char* &e)

diff --git a/src/Native/Runtime/thread.cpp b/src/Native/Runtime/thread.cpp
@@ -33,7 +33,7 @@
 EXTERN_C REDHAWK_API void* REDHAWK_CALLCONV RhpHandleAlloc(void* pObject, int type);
 EXTERN_C REDHAWK_API void REDHAWK_CALLCONV RhHandleFree(void*);
 
-static int (*InitializeRuntimePtr)();
+static int (*g_RuntimeInitializationCallback)();
 static Thread* g_RuntimeInitializingThread;
 
 #ifdef _MSC_VER
@@ -1120,17 +1120,17 @@ FORCEINLINE bool Thread::InlineTryFastReversePInvoke(ReversePInvokeFrame * pFram
 
 EXTERN_C void RhSetRuntimeInitializationCallback(int (*fPtr)())
 {
-    InitializeRuntimePtr = fPtr;
+    g_RuntimeInitializationCallback = fPtr;
 }
 
 void Thread::ReversePInvokeAttachOrTrapThread(ReversePInvokeFrame * pFrame)
 {
     if (!IsStateSet(TSF_Attached))
     {
-        if (*InitializeRuntimePtr != NULL && g_RuntimeInitializingThread != this)
+        if (*g_RuntimeInitializationCallback != NULL && g_RuntimeInitializingThread != this)
         {
             g_RuntimeInitializingThread = this;
-            (*InitializeRuntimePtr)();
+            (*g_RuntimeInitializationCallback)();
             g_RuntimeInitializingThread = NULL;
         }
 

diff --git a/src/Native/Runtime/unix/PalRedhawkUnix.cpp b/src/Native/Runtime/unix/PalRedhawkUnix.cpp
@@ -1205,8 +1205,6 @@ REDHAWK_PALEXPORT bool PalGetMaximumStackBounds(_Out_ void** ppStackLowOut, _Out
     return true;
 }
 
-extern "C" int main(int argc, char** argv);
-
 // retrieves the full path to the specified module, if moduleBase is NULL retreieves the full path to the
 // executable module of the current process.
 //