Make DllMain have C linkage.

TRAC #21839 Issue=377 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@1306 736b8ea6-26fd-11df-bfd4-992fa37f6226

Make DllMain have C linkage.
fad16ed4 · daniel@transgaming.com · 5127803f · fad16ed4 · fad16ed4 · fad16ed4
Commit fad16ed4 authored Oct 17, 2012 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

version.h src/common/version.h +1 -1

main.cpp src/libEGL/main.cpp +1 -1

main.cpp src/libGLESv2/main.cpp +2 -2

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1305
+#define BUILD_REVISION 1306
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libEGL/main.cpp
+++ b/src/libEGL/main.cpp
@@ -12,7 +12,7 @@
 static DWORD currentTLS = TLS_OUT_OF_INDEXES;
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
+extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
 {
    switch (reason)
    {

--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
 //
-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -16,7 +16,7 @@
 static DWORD currentTLS = TLS_OUT_OF_INDEXES;
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
+extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
 {
    switch (reason)
    {