A few linux improvements/fixes for the previous check in.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22292 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 31f1725..0b1d65a 100644 (file)
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -207,12 +207,10 @@ int C_DECL main(int argc, char* argv[])
         ShDestruct(linker);
         ShDestruct(uniformMap);
 
-#ifdef _WIN32
         if (delay)
             Sleep(1000000);
 
     }
-#endif
 
     if (compileFailed)
         return EFailCompile;

diff --git a/glslang/MachineIndependent/InfoSink.cpp b/glslang/MachineIndependent/InfoSink.cpp
index 50e8a6d..17a906d 100644 (file)
--- a/glslang/MachineIndependent/InfoSink.cpp
+++ b/glslang/MachineIndependent/InfoSink.cpp
@@ -34,11 +34,7 @@
 
 #include "Include/InfoSink.h"
 
-#ifdef _WIN32
-    #include <windows.h>
-#else
-    #include <string.h>
-#endif
+#include <string.h>
 
 void TInfoSinkBase::append(const char *s)           
 {
@@ -47,10 +43,10 @@ void TInfoSinkBase::append(const char *s)
         sink.append(s); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(s);
-#endif
+//#ifdef _WIN32
+//    if (outputStream & EDebugger)
+//        OutputDebugString(s);
+//#endif
 
     if (outputStream & EStdOut)
         fprintf(stdout, "%s", s);
@@ -63,14 +59,14 @@ void TInfoSinkBase::append(int count, char c)
         sink.append(count, c); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger) {
-        char str[2];
-        str[0] = c;
-        str[1] = '\0';
-        OutputDebugString(str);
-    }
-#endif
+//#ifdef _WIN32
+//    if (outputStream & EDebugger) {
+//        char str[2];
+//        str[0] = c;
+//        str[1] = '\0';
+//        OutputDebugString(str);
+//    }
+//#endif
 
     if (outputStream & EStdOut)
         fprintf(stdout, "%c", c);
@@ -83,10 +79,10 @@ void TInfoSinkBase::append(const TPersistString& t)
         sink.append(t); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(t.c_str());
-#endif
+//#ifdef _WIN32
+//    if (outputStream & EDebugger)
+//        OutputDebugString(t.c_str());
+//#endif
 
     if (outputStream & EStdOut)
         fprintf(stdout, "%s", t.c_str());
@@ -99,10 +95,10 @@ void TInfoSinkBase::append(const TString& t)
         sink.append(t.c_str()); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(t.c_str());
-#endif
+//#ifdef _WIN32
+//    if (outputStream & EDebugger)
+//        OutputDebugString(t.c_str());
+//#endif
 
     if (outputStream & EStdOut)
         fprintf(stdout, "%s", t.c_str());

diff --git a/glslang/MachineIndependent/preprocessor/Makefile b/glslang/MachineIndependent/preprocessor/Makefile
index 467e2a1..5232aac 100644 (file)
--- a/glslang/MachineIndependent/preprocessor/Makefile
+++ b/glslang/MachineIndependent/preprocessor/Makefile
@@ -29,10 +29,10 @@ depend:
 
 # DO NOT DELETE
 
-PpAtom.o: PpContext.h PpToken.h
-PpScanner.o: PpContext.h PpToken.h
-PpTokens.o: PpContext.h PpToken.h
-Pp.o: PpContext.h PpToken.h
-PpContext.o: PpContext.h PpToken.h
-PpMemory.o: PpContext.h PpToken.h
-PpSymbols.o: PpContext.h PpToken.h
+PpAtom.o: PpContext.h PpTokens.h
+PpScanner.o: PpContext.h PpTokens.h
+PpTokens.o: PpContext.h PpTokens.h
+Pp.o: PpContext.h PpTokens.h
+PpContext.o: PpContext.h PpTokens.h
+PpMemory.o: PpContext.h PpTokens.h
+PpSymbols.o: PpContext.h PpTokens.h

diff --git a/glslang/MachineIndependent/preprocessor/PpContext.h b/glslang/MachineIndependent/preprocessor/PpContext.h
index 7f07020..5e228a1 100644 (file)
--- a/glslang/MachineIndependent/preprocessor/PpContext.h
+++ b/glslang/MachineIndependent/preprocessor/PpContext.h
@@ -145,19 +145,20 @@ public:
         int nextFree;
         int size;
     };
-    typedef struct HashEntry_Rec {
+    struct HashEntry {
         int index;      // String table offset of string representation
         int value;      // Atom (symbol) value
-    } HashEntry;
+    };
 
     static const int hashTableMaxCollisions = 3;
 
-    typedef struct HashTable_Rec {
+    struct HashTable {
         HashEntry *entry;
         int size;
         int entries;
         int counts[hashTableMaxCollisions + 1];
-    } HashTable;
+    };
+
     struct AtomTable {
         StringTable stable; // String table.
         HashTable htable;   // Hashes string to atom number and token value.  Multiple strings can
@@ -197,7 +198,7 @@ public:
         } details;
     };
 
-    typedef struct SymbolList {
+    struct SymbolList {
         struct SymbolList_Rec *next;
         Symbol *symb;
     };
@@ -237,11 +238,11 @@ protected:
     int elsetracker;             // #if-#else and #endif constructs...Counter.
     const char *ErrMsg;
 
-    typedef struct MacroInputSrc {
+    struct MacroInputSrc {
         InputSrc    base;
         MacroSymbol *mac;
         TokenStream **args;
-    } MacroInputSrc;
+    };
 
     InputSrc *currentInput;
 

diff --git a/glslang/MachineIndependent/preprocessor/PpScanner.cpp b/glslang/MachineIndependent/preprocessor/PpScanner.cpp
index 299e5c2..cc7f277 100644 (file)
--- a/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+++ b/glslang/MachineIndependent/preprocessor/PpScanner.cpp
@@ -86,13 +86,6 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdlib.h>
 #include <string.h>
 
-#if 0
-#include <ieeefp.h>
-#else
-#define isinff(x) (((*(int *)&(x) & 0x7f800000L)==0x7f800000L) && \
-    ((*(int *)&(x) & 0x007fffffL)==0000000000L))
-#endif
-
 #include "PpContext.h"
 #include "PpTokens.h"