From 2fb2e27e28569371bd0d12aa74504d53bb04edc0 Mon Sep 17 00:00:00 2001
From: Michal Krol <mjkrol@gmail.org>
Date: Fri, 18 Mar 2005 14:28:02 +0000
Subject: update against 03-Feb-2005 release

---
 src/mesa/shader/slang/OSDependent/Windows/osinclude.h  |  4 ++--
 src/mesa/shader/slang/OSDependent/Windows/ossource.cpp | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/mesa/shader/slang/OSDependent/Windows')

diff --git a/src/mesa/shader/slang/OSDependent/Windows/osinclude.h b/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
index c74a46b8fa..97a9e9f3df 100755
--- a/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
+++ b/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
@@ -1,5 +1,5 @@
 //
-//Copyright (C) 2002-2004  3Dlabs Inc. Ltd.
+//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #error Trying to include a windows specific file in a non windows build.
 #endif
 
-#define STRICT 1
+#define STRICT
 #define VC_EXTRALEAN 1
 #include <windows.h>
 #include <assert.h>
diff --git a/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp b/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp
index 81af9688b2..35d086614c 100755
--- a/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp
+++ b/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp
@@ -1,5 +1,5 @@
 //
-//Copyright (C) 2002-2004  3Dlabs Inc. Ltd.
+//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,7 @@
 #error Trying to build a windows specific file in a non windows build.
 #endif
 
-//
-// disable DllMain on Mesa-3D builds, call appropriate Init* and Detach*
-// routines manually in context initialization
-//
-/*BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     switch (fdwReason)
     {
@@ -76,7 +72,7 @@
     }
 
     return true;
-}*/
+}
 
 //
 // Thread Local Storage Operations
-- 
cgit v1.2.3