aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/linker.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-22 17:28:46 +0000
committermarha <marha@users.sourceforge.net>2011-01-22 17:28:46 +0000
commitf544012f5c37fba02cae71b39a533f8296cdabb5 (patch)
tree362b7ac783787d77962014f5f8e4e7c116de3f3f /mesalib/src/glsl/linker.cpp
parent58eb5cd6de079f1f3ddf1edc2d436a24eb858dc2 (diff)
parentb8ffa56f8bda74a402eae0c89aadfda7b7db507f (diff)
downloadvcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.tar.gz
vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.tar.bz2
vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
-rw-r--r--mesalib/src/glsl/linker.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 23349f617..9f4b4149c 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -68,10 +68,6 @@
#include <cstdarg>
#include <climits>
-extern "C" {
-#include <talloc.h>
-}
-
#include "main/core.h"
#include "glsl_symbol_table.h"
#include "ir.h"