2 files changed, 22 insertions, 15 deletions

diff --git a/src/java/com/jogamp/gluegen/GlueGen.java b/src/java/com/jogamp/gluegen/GlueGen.java
index 719d54c..f24d0b2 100644
--- a/src/java/com/jogamp/gluegen/GlueGen.java
+++ b/src/java/com/jogamp/gluegen/GlueGen.java
@@ -107,23 +107,24 @@ public class GlueGen implements GlueEmitterControls {
             final PipedInputStream ppIn = new PipedInputStream();
             final PipedOutputStream ppOut = new PipedOutputStream(ppIn);
 
+            File out = File.createTempFile("PCPPTemp", ".pcpp");
+            FileOutputStream outStream = new FileOutputStream(out);
+
+            if(debug) {
+                System.err.println("PCPP output at (persistent): " + out.getAbsolutePath());
+            } else {
+                out.deleteOnExit();
+            }
+
             preprocessor = new PCPP(includePaths, debug, copyPCPPOutput2Stderr);
-            preprocessor.setOut(ppOut);
+            preprocessor.setOut(outStream);
 
-            new Thread("PCPP") {
+            preprocessor.run(reader, filename);
+            outStream.flush();
 
-                @Override
-                public void run() {
-                    try {
-                        preprocessor.run(reader, filename);
-                        ppOut.close();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }.start();
+            FileInputStream inStream = new FileInputStream(out);
+            DataInputStream dis = new DataInputStream(inStream);
 
-            DataInputStream dis = new DataInputStream(ppIn);
             GnuCLexer lexer = new GnuCLexer(dis);
             lexer.setTokenObjectClass(CToken.class.getName());
             lexer.initialize();
diff --git a/src/java/com/jogamp/gluegen/pcpp/PCPP.java b/src/java/com/jogamp/gluegen/pcpp/PCPP.java
index 95a4b43..db45e3e 100644
--- a/src/java/com/jogamp/gluegen/pcpp/PCPP.java
+++ b/src/java/com/jogamp/gluegen/pcpp/PCPP.java
@@ -551,17 +551,23 @@ public class PCPP {
                     debugPrint(true, "DEFINE " + name + " ["+oldDef+" ] -> "+value + " CONST");
                     //System.err.println("//---DEFINED: " + name + " to \"" + value + "\"");
                 } else {
-                    debugPrint(true, "DEFINE " + name + " -> "+value + " SYMB");
                     // Value is a symbolic constant like "#define FOO BAR".
                     // Try to look up the symbol's value
                     String newValue = resolveDefine(value, true);
+                    debugPrint(true, "DEFINE " + name + " -> "+value + " -> <" + newValue + "> SYMB");
                     if (newValue != null) {
                         // Set the value to the value of the symbol.
                         //
                         // TO DO: Is this correct? Why not output the symbol unchanged?
                         // I think that it's a good thing to see that some symbols are
                         // defined in terms of others. -chris
-                        values.set(0, newValue);
+                        macroDefinition = newValue.contains("(");
+                        if(macroDefinition) {
+                            // parser can't dig this currently
+                            emitDefine = false;
+                        } else {
+                            values.set(0, newValue);
+                        }
                     } else {
                         // Still perform textual replacement
                         defineMap.put(name, value);