commit 1714ed34bad9bae71c96bada676368bfbbf99fd0
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 29 22:53:49 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 29 22:53:49 2013 +0000
tree 7976306241548af8c6ef9c59e284e2fab72ec29c
parent 96f01b580a963f464eb1ae62ca8ad2968117d960

Fix linker issue on Windows

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@2257 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index bee3651..a634633 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 1
 #define BUILD_VERSION 0
-#define BUILD_REVISION 2244
+#define BUILD_REVISION 2245
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/DetectCallDepth.cpp

diff --git a/src/compiler/DetectCallDepth.cpp b/src/compiler/DetectCallDepth.cpp
index 99f810b..60df52c 100644
--- a/src/compiler/DetectCallDepth.cpp
+++ b/src/compiler/DetectCallDepth.cpp
@@ -7,8 +7,6 @@
 #include "compiler/DetectCallDepth.h"
 #include "compiler/InfoSink.h"
 
-const int DetectCallDepth::FunctionNode::kInfiniteCallDepth;
-
 DetectCallDepth::FunctionNode::FunctionNode(const TString& fname)
     : name(fname),
       visit(PreVisit)