Merging MinGW changes

5 files changed, 106 insertions, 106 deletions

diff --git a/winsup/mingw/samples/simpledll/dll.c b/winsup/mingw/samples/simpledll/dll.c
index 7f743bfcd..c642af4d8 100644
--- a/winsup/mingw/samples/simpledll/dll.c
+++ b/winsup/mingw/samples/simpledll/dll.c
@@ -1,33 +1,33 @@
-

-#include <windows.h>

-

-BOOL WINAPI

-DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)

-{

-	switch (dwReason)

-	{

-		case DLL_PROCESS_ATTACH:

-			printf ("DLL Attached.\n");

-			break;

-

-		case DLL_PROCESS_DETACH:

-			printf ("DLL Detached.\n");

-			break;

-

-		case DLL_THREAD_ATTACH:

-			printf ("DLL Thread Attached.\n");

-			break;

-

-		case DLL_THREAD_DETACH:

-			printf ("DLL Thread Detached.\n");

-			break;

-	}

-	return TRUE;

-}

-

-void

-Test ()

-{

-	printf ("Test Function called!\n");

-}

-

+
+#include <windows.h>
+
+BOOL WINAPI
+DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
+{
+	switch (dwReason)
+	{
+		case DLL_PROCESS_ATTACH:
+			printf ("DLL Attached.\n");
+			break;
+
+		case DLL_PROCESS_DETACH:
+			printf ("DLL Detached.\n");
+			break;
+
+		case DLL_THREAD_ATTACH:
+			printf ("DLL Thread Attached.\n");
+			break;
+
+		case DLL_THREAD_DETACH:
+			printf ("DLL Thread Detached.\n");
+			break;
+	}
+	return TRUE;
+}
+
+void
+Test ()
+{
+	printf ("Test Function called!\n");
+}
+
diff --git a/winsup/mingw/samples/simpledll/dll.cpp b/winsup/mingw/samples/simpledll/dll.cpp
index 0c0240685..cdf0dfb9f 100644
--- a/winsup/mingw/samples/simpledll/dll.cpp
+++ b/winsup/mingw/samples/simpledll/dll.cpp
@@ -1,44 +1,44 @@
-//

-// This is a C++ version of the code in dll.c. NOTE that you need to put

-// extern "C" { ... } around DllMain or it will not be called when your

-// Dll starts up! (It will get name mangled as a C++ function and the C

-// default version in libmingw32.a will get called instead.)

-//

-

-#include <windows.h>

-

-#include <iostream>

-

-extern "C" {

-

-BOOL WINAPI

-DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)

-{

-	switch (dwReason)

-	{

-		case DLL_PROCESS_ATTACH:

-			cout << "Dll Attached" << endl ;

-			break;

-

-		case DLL_PROCESS_DETACH:

-			cout << "Dll Detached" << endl ;

-			break;

-

-		case DLL_THREAD_ATTACH:

-			printf ("DLL Thread Attached.\n");

-			break;

-

-		case DLL_THREAD_DETACH:

-			printf ("DLL Thread Detached.\n");

-			break;

-	}

-	return TRUE;

-}

-

-void

-Test ()

-{

-	printf ("Test Function called!\n");

-}

-

-};

+//
+// This is a C++ version of the code in dll.c. NOTE that you need to put
+// extern "C" { ... } around DllMain or it will not be called when your
+// Dll starts up! (It will get name mangled as a C++ function and the C
+// default version in libmingw32.a will get called instead.)
+//
+
+#include <windows.h>
+
+#include <iostream>
+
+extern "C" {
+
+BOOL WINAPI
+DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
+{
+	switch (dwReason)
+	{
+		case DLL_PROCESS_ATTACH:
+			cout << "Dll Attached" << endl ;
+			break;
+
+		case DLL_PROCESS_DETACH:
+			cout << "Dll Detached" << endl ;
+			break;
+
+		case DLL_THREAD_ATTACH:
+			printf ("DLL Thread Attached.\n");
+			break;
+
+		case DLL_THREAD_DETACH:
+			printf ("DLL Thread Detached.\n");
+			break;
+	}
+	return TRUE;
+}
+
+void
+Test ()
+{
+	printf ("Test Function called!\n");
+}
+
+};
diff --git a/winsup/mingw/samples/simpledll/dll.def b/winsup/mingw/samples/simpledll/dll.def
index 0a623d6b5..3cabd50a5 100644
--- a/winsup/mingw/samples/simpledll/dll.def
+++ b/winsup/mingw/samples/simpledll/dll.def
@@ -1,2 +1,2 @@
-EXPORTS

-Test

+EXPORTS
+Test
diff --git a/winsup/mingw/samples/simpledll/exe.c b/winsup/mingw/samples/simpledll/exe.c
index cc44202ee..af5bb41df 100644
--- a/winsup/mingw/samples/simpledll/exe.c
+++ b/winsup/mingw/samples/simpledll/exe.c
@@ -1,13 +1,13 @@
-#include <stdio.h>

-

-extern void Test();

-

-int main()

-{

-	printf ("Program started.\n");

-	Test ();

-	printf ("Program ends.\n");

-

-	return 0;

-}

-

+#include <stdio.h>
+
+extern void Test();
+
+int main()
+{
+	printf ("Program started.\n");
+	Test ();
+	printf ("Program ends.\n");
+
+	return 0;
+}
+
diff --git a/winsup/mingw/samples/simpledll/jamfile b/winsup/mingw/samples/simpledll/jamfile
index 30704e68d..d1e2591be 100644
--- a/winsup/mingw/samples/simpledll/jamfile
+++ b/winsup/mingw/samples/simpledll/jamfile
@@ -1,14 +1,14 @@
-

-Dll dll.dll : dll.c ;

-

-ImportLib libdll.a : dll.def ;

-

-

-Main exe.exe : exe.c ;

-

-LinkLibraries exe.exe : libdll.a ;

-

-DEPENDS exe.exe : dll.dll ;

-

-LINKFLAGS on exe.exe = $(LINKFLAGS) -L. ;

-

+
+Dll dll.dll : dll.c ;
+
+ImportLib libdll.a : dll.def ;
+
+
+Main exe.exe : exe.c ;
+
+LinkLibraries exe.exe : libdll.a ;
+
+DEPENDS exe.exe : dll.dll ;
+
+LINKFLAGS on exe.exe = $(LINKFLAGS) -L. ;
+