From 6490faa5c5b542d96bdac58b4328b4eb71525af0 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Fri, 14 Jan 2011 02:05:01 +0000
Subject: [PATCH] Prevent CSRI helper library from causing linking apps (like
 aegisub.exe) to export symbols.

Originally committed to SVN as r5184.
---
 aegisub/build/msbuild/csrihelper/csrihelper.vcxproj | 2 +-
 contrib/csri/include/visibility.h                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aegisub/build/msbuild/csrihelper/csrihelper.vcxproj b/aegisub/build/msbuild/csrihelper/csrihelper.vcxproj
index ef6b76a13..0122c2e9f 100644
--- a/aegisub/build/msbuild/csrihelper/csrihelper.vcxproj
+++ b/aegisub/build/msbuild/csrihelper/csrihelper.vcxproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CSRI_NO_EXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SrcDir)include\;$(SrcDir)lib\;$(SrcDir)lib\win32\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/contrib/csri/include/visibility.h b/contrib/csri/include/visibility.h
index 632f07ef2..c994ac681 100644
--- a/contrib/csri/include/visibility.h
+++ b/contrib/csri/include/visibility.h
@@ -26,7 +26,7 @@
 #include "acconf.h"
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(CSRI_NO_EXPORT)
 #define export __declspec(dllexport)
 #define internal
 #define hidden