update against 03-Feb-2005 release

4 files changed, 86 insertions, 85 deletions

diff --git a/src/mesa/shader/slang/OSDependent/Linux/osinclude.h b/src/mesa/shader/slang/OSDependent/Linux/osinclude.h
index e71ede00e96..8b20b961c05 100755
--- a/src/mesa/shader/slang/OSDependent/Linux/osinclude.h
+++ b/src/mesa/shader/slang/OSDependent/Linux/osinclude.h
@@ -1,73 +1,78 @@
-//
-//Copyright (C) 2002-2004  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef __OSINCLUDE_H
-#define __OSINCLUDE_H
-
-//
-// This file contains any Linux specific functions.
-//
-
-#include <pthread.h>
-#include <semaphore.h>
-#include <assert.h>
-#include <errno.h>
-#include "Include/InitializeGlobals.h"
-#include "Include/PoolAlloc.h"
-
-#define _vsnprintf vsnprintf
-
-void DetachThreadLinux(void *);
-
-//
-// Thread Local Storage Operations
-//
-typedef unsigned int OS_TLSIndex;
-#define OS_INVALID_TLS_INDEX 0xFFFFFFFF
-
-OS_TLSIndex OS_AllocTLSIndex();
-bool        OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
-bool        OS_FreeTLSIndex(OS_TLSIndex nIndex); 
-
-
-inline void * OS_GetTLSValue(OS_TLSIndex nIndex)
-{
-    //
-    // This function should return 0 if nIndex is invalid.
-    //
-    assert(nIndex != OS_INVALID_TLS_INDEX);
-    return (pthread_getspecific(nIndex)); 
-}
-
-#endif // __OSINCLUDE_H
+//

+//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.

+//All rights reserved.

+//

+//Redistribution and use in source and binary forms, with or without

+//modification, are permitted provided that the following conditions

+//are met:

+//

+//    Redistributions of source code must retain the above copyright

+//    notice, this list of conditions and the following disclaimer.

+//

+//    Redistributions in binary form must reproduce the above

+//    copyright notice, this list of conditions and the following

+//    disclaimer in the documentation and/or other materials provided

+//    with the distribution.

+//

+//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its

+//    contributors may be used to endorse or promote products derived

+//    from this software without specific prior written permission.

+//

+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

+//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

+//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

+//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

+//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

+//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

+//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+//POSSIBILITY OF SUCH DAMAGE.

+//

+

+#ifndef __OSINCLUDE_H

+#define __OSINCLUDE_H

+

+//

+// This file contains any Linux specific functions.

+//

+

+/* WORKAROUND: linux builds seem not to define "linux" */

+/*#if !(defined(linux))

+#error Trying to include a Linux specific file in a non-Linux build.

+#endif*/

+

+#include <pthread.h>

+#include <semaphore.h>

+#include <assert.h>

+#include <errno.h>

+#include "Include/InitializeGlobals.h"

+#include "Include/PoolAlloc.h"

+

+#define _vsnprintf vsnprintf

+

+void DetachThreadLinux(void *);

+

+//

+// Thread Local Storage Operations

+//

+typedef unsigned int OS_TLSIndex;

+#define OS_INVALID_TLS_INDEX 0xFFFFFFFF

+

+OS_TLSIndex OS_AllocTLSIndex();

+bool        OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);

+bool        OS_FreeTLSIndex(OS_TLSIndex nIndex); 

+

+

+inline void * OS_GetTLSValue(OS_TLSIndex nIndex)

+{

+    //

+    // This function should return 0 if nIndex is invalid.

+    //

+    assert(nIndex != OS_INVALID_TLS_INDEX);

+    return (pthread_getspecific(nIndex)); 

+}

+

+#endif // __OSINCLUDE_H

diff --git a/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp b/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp
index a54cf830149..4bcd66a3151 100755
--- a/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp
+++ b/src/mesa/shader/slang/OSDependent/Linux/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

@@ -38,9 +38,9 @@
 #include "osinclude.h"

 #include "Initialisation.h"

 

-#if !(defined(linux))

+/*#if !(defined(linux))

 #error Trying to build a Linux specific file in a non-Linux build.

-#endif

+#endif*/

 

 //

 // Thread cleanup

diff --git a/src/mesa/shader/slang/OSDependent/Windows/osinclude.h b/src/mesa/shader/slang/OSDependent/Windows/osinclude.h
index c74a46b8fa8..97a9e9f3dfb 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 81af9688b2c..35d086614c0 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