avoiding module duplicate during linking

git-svn-id: http://svn.miranda-ng.org/main/trunk@12461 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 63 insertions, 85 deletions

diff --git a/plugins/Dbx_mdb/Dbx_mdb_12.vcxproj b/plugins/Dbx_mdb/Dbx_mdb_12.vcxproj
index 69409a3a09..ec22d8b299 100644
--- a/plugins/Dbx_mdb/Dbx_mdb_12.vcxproj
+++ b/plugins/Dbx_mdb/Dbx_mdb_12.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectName>Dbx_mdb</ProjectName>

-    <ProjectGuid>{6D25A8AD-5251-4DAE-AA49-0E819F6A615A}</ProjectGuid>

+    <ProjectGuid>{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}</ProjectGuid>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -205,10 +205,10 @@
     <ClCompile Include="src\dbmodulechain.cpp" />

     <ClCompile Include="src\dbsettings.cpp" />

     <ClCompile Include="src\lmdb\mdb.c">

-      <PrecompiledHeader >NotUsing</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\lmdb\midl.c">

-      <PrecompiledHeader >NotUsing</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj
index 8b53b68889..c192cfe7ac 100644
--- a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj
+++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj
@@ -126,6 +126,7 @@
     </Lib>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="..\Libgpg-error\err-visibility.c" />

     <ClCompile Include="cipher\arcfour.c" />

     <ClCompile Include="cipher\blowfish.c" />

     <ClCompile Include="cipher\camellia-glue.c" />

@@ -241,12 +242,12 @@
     <ClCompile Include="..\Libgpg-error\strsource-sym.c" />

     <ClCompile Include="..\Libgpg-error\strsource.c" />

     <ClCompile Include="..\Libgpg-error\version.c" />

-    <ClCompile Include="..\Libgpg-error\visibility.c" />

     <ClCompile Include="..\Libgpg-error\w32-gettext.c" />

     <ClCompile Include="..\Libgpg-error\w32-lock.c" />

     <ClCompile Include="..\Libgpg-error\w32-thread.c" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="..\Libgpg-error\err-visibility.h" />

     <ClInclude Include="cipher\bithelp.h" />

     <ClInclude Include="cipher\camellia.h" />

     <ClInclude Include="cipher\cipher-internal.h" />

@@ -297,7 +298,6 @@
     <ClInclude Include="..\Libgpg-error\init.h" />

     <ClInclude Include="..\Libgpg-error\mkerrcodes.h" />

     <ClInclude Include="..\Libgpg-error\thread.h" />

-    <ClInclude Include="..\Libgpg-error\visibility.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="src\libgcrypt.def" />

diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters
index 60739541cb..fb66464cf4 100644
--- a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters
+++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters
@@ -198,9 +198,6 @@
     <ClCompile Include="cipher\whirlpool.c">

       <Filter>cipher</Filter>

     </ClCompile>

-    <ClCompile Include="compat\compat.c">

-      <Filter>compat</Filter>

-    </ClCompile>

     <ClCompile Include="mpi\ec-ed25519.c">

       <Filter>mpi</Filter>

     </ClCompile>

@@ -306,9 +303,6 @@
     <ClCompile Include="src\missing-string.c">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="src\module.c">

-      <Filter>src</Filter>

-    </ClCompile>

     <ClCompile Include="src\secmem.c">

       <Filter>src</Filter>

     </ClCompile>

@@ -372,9 +366,6 @@
     <ClCompile Include="..\Libgpg-error\version.c">

       <Filter>error</Filter>

     </ClCompile>

-    <ClCompile Include="..\Libgpg-error\visibility.c">

-      <Filter>error</Filter>

-    </ClCompile>

     <ClCompile Include="..\Libgpg-error\w32-gettext.c">

       <Filter>error</Filter>

     </ClCompile>

@@ -384,6 +375,10 @@
     <ClCompile Include="..\Libgpg-error\w32-thread.c">

       <Filter>error</Filter>

     </ClCompile>

+    <ClCompile Include="compat\compat.c" />

+    <ClCompile Include="..\Libgpg-error\err-visibility.c">

+      <Filter>error</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="cipher\bithelp.h">

@@ -422,9 +417,6 @@
     <ClInclude Include="cipher\rmd.h">

       <Filter>cipher</Filter>

     </ClInclude>

-    <ClInclude Include="compat\libcompat.h">

-      <Filter>compat</Filter>

-    </ClInclude>

     <ClInclude Include="mpi\ec-internal.h">

       <Filter>mpi</Filter>

     </ClInclude>

@@ -536,7 +528,8 @@
     <ClInclude Include="..\Libgpg-error\thread.h">

       <Filter>error</Filter>

     </ClInclude>

-    <ClInclude Include="..\Libgpg-error\visibility.h">

+    <ClInclude Include="compat\libcompat.h" />

+    <ClInclude Include="..\Libgpg-error\err-visibility.h">

       <Filter>error</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj
index 94a453af74..dcb6926569 100644
--- a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj
+++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj
@@ -114,6 +114,7 @@
     </ClCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="..\Libgpg-error\err-visibility.c" />

     <ClCompile Include="cipher\arcfour.c" />

     <ClCompile Include="cipher\blowfish.c" />

     <ClCompile Include="cipher\camellia-glue.c" />

@@ -229,12 +230,12 @@
     <ClCompile Include="..\Libgpg-error\strsource-sym.c" />

     <ClCompile Include="..\Libgpg-error\strsource.c" />

     <ClCompile Include="..\Libgpg-error\version.c" />

-    <ClCompile Include="..\Libgpg-error\visibility.c" />

     <ClCompile Include="..\Libgpg-error\w32-gettext.c" />

     <ClCompile Include="..\Libgpg-error\w32-lock.c" />

     <ClCompile Include="..\Libgpg-error\w32-thread.c" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="..\Libgpg-error\err-visibility.h" />

     <ClInclude Include="cipher\bithelp.h" />

     <ClInclude Include="cipher\camellia.h" />

     <ClInclude Include="cipher\cipher-internal.h" />

@@ -285,7 +286,6 @@
     <ClInclude Include="..\Libgpg-error\init.h" />

     <ClInclude Include="..\Libgpg-error\mkerrcodes.h" />

     <ClInclude Include="..\Libgpg-error\thread.h" />

-    <ClInclude Include="..\Libgpg-error\visibility.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="src\libgcrypt.def" />

diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters
index 60739541cb..fb66464cf4 100644
--- a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters
+++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters
@@ -198,9 +198,6 @@
     <ClCompile Include="cipher\whirlpool.c">

       <Filter>cipher</Filter>

     </ClCompile>

-    <ClCompile Include="compat\compat.c">

-      <Filter>compat</Filter>

-    </ClCompile>

     <ClCompile Include="mpi\ec-ed25519.c">

       <Filter>mpi</Filter>

     </ClCompile>

@@ -306,9 +303,6 @@
     <ClCompile Include="src\missing-string.c">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="src\module.c">

-      <Filter>src</Filter>

-    </ClCompile>

     <ClCompile Include="src\secmem.c">

       <Filter>src</Filter>

     </ClCompile>

@@ -372,9 +366,6 @@
     <ClCompile Include="..\Libgpg-error\version.c">

       <Filter>error</Filter>

     </ClCompile>

-    <ClCompile Include="..\Libgpg-error\visibility.c">

-      <Filter>error</Filter>

-    </ClCompile>

     <ClCompile Include="..\Libgpg-error\w32-gettext.c">

       <Filter>error</Filter>

     </ClCompile>

@@ -384,6 +375,10 @@
     <ClCompile Include="..\Libgpg-error\w32-thread.c">

       <Filter>error</Filter>

     </ClCompile>

+    <ClCompile Include="compat\compat.c" />

+    <ClCompile Include="..\Libgpg-error\err-visibility.c">

+      <Filter>error</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="cipher\bithelp.h">

@@ -422,9 +417,6 @@
     <ClInclude Include="cipher\rmd.h">

       <Filter>cipher</Filter>

     </ClInclude>

-    <ClInclude Include="compat\libcompat.h">

-      <Filter>compat</Filter>

-    </ClInclude>

     <ClInclude Include="mpi\ec-internal.h">

       <Filter>mpi</Filter>

     </ClInclude>

@@ -536,7 +528,8 @@
     <ClInclude Include="..\Libgpg-error\thread.h">

       <Filter>error</Filter>

     </ClInclude>

-    <ClInclude Include="..\Libgpg-error\visibility.h">

+    <ClInclude Include="compat\libcompat.h" />

+    <ClInclude Include="..\Libgpg-error\err-visibility.h">

       <Filter>error</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/MirOTR/Libgpg-error/visibility.c b/plugins/MirOTR/Libgpg-error/err-visibility.c
index 9213ce92f5..9213ce92f5 100644
--- a/plugins/MirOTR/Libgpg-error/visibility.c
+++ b/plugins/MirOTR/Libgpg-error/err-visibility.c
diff --git a/plugins/MirOTR/Libgpg-error/visibility.h b/plugins/MirOTR/Libgpg-error/err-visibility.h
index 6f7de8496e..a75bb9b857 100644
--- a/plugins/MirOTR/Libgpg-error/visibility.h
+++ b/plugins/MirOTR/Libgpg-error/err-visibility.h
@@ -1,4 +1,4 @@
-/* visibility.h - Set visibility attribute
+/* err-visibility.h - Set visibility attribute
  * Copyright (C) 2014  g10 Code GmbH
  *
  * This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/gpgrt-int.h b/plugins/MirOTR/Libgpg-error/gpgrt-int.h
index bc2db8b83a..5a05b9968b 100644
--- a/plugins/MirOTR/Libgpg-error/gpgrt-int.h
+++ b/plugins/MirOTR/Libgpg-error/gpgrt-int.h
@@ -21,7 +21,7 @@
 #define _GPGRT_GPGRT_INT_H
 
 #include "gpg-error.h"
-#include "visibility.h"
+#include "err-visibility.h"
 
 /* Local error function prototypes.  */
 const char *_gpg_strerror (gpg_error_t err);
diff --git a/plugins/MirOTR/ekhtml/ekhtml_12.vcxproj.filters b/plugins/MirOTR/ekhtml/ekhtml_12.vcxproj.filters
index f685538610..ff071a847b 100644
--- a/plugins/MirOTR/ekhtml/ekhtml_12.vcxproj.filters
+++ b/plugins/MirOTR/ekhtml/ekhtml_12.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

     </Filter>

-    <Filter Include="Ressourcendateien">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\ekhtml.c">

diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp
index de3f7e42ed..92608222b5 100644
--- a/plugins/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/src/otr.cpp
@@ -344,52 +344,48 @@ gcry_error_t otrl_privkey_write_FILEp(OtrlUserState us, FILE *privf);
 /* Generate a private DSA key for a given account, storing it into a

 * file on disk, and loading it into the given OtrlUserState.  Overwrite any

 * previously generated keys for that account in that OtrlUserState. */

- gcry_error_t otrl_privkey_write(OtrlUserState us, const char *filename)

+gcry_error_t otrl_privkey_write(OtrlUserState us, const char *filename)

+{

+	gcry_error_t err;

+	FILE *privf;

+#ifndef WIN32

+	mode_t oldmask = umask(077);

+#endif

+	privf = fopen(filename, "w+b");

+	if (!privf) {

+#ifndef WIN32

+		umask(oldmask);

+#endif

+		err = gcry_error_from_errno(errno);

+		return err;

+	}

+

+	err = otrl_privkey_write_FILEp(us, privf);

+

+	fclose(privf);

+#ifndef WIN32

+	umask(oldmask);

+#endif

+	return err;

+}

+

+ /* Just store the private keys of an OtrlUserState.

+  * The FILE* must be open for reading and writing. */

+ gcry_error_t otrl_privkey_write_FILEp(OtrlUserState us, FILE *privf)

  {

-	 gcry_error_t err;

-	 FILE *privf;

-	 #ifndef WIN32

-		 mode_t oldmask;

-	 #endif

-		 

-		 #ifndef WIN32

-		 oldmask = umask(077);

-	 #endif

-		 privf = fopen(filename, "w+b");

-	 if (!privf) {

-		 #ifndef WIN32

-			 umask(oldmask);

-		 #endif

-			 err = gcry_error_from_errno(errno);

-		 return err;

-		 }

-

-		 err = otrl_privkey_write_FILEp(us, privf);

-

-		 fclose(privf);

-	 #ifndef WIN32

-		 umask(oldmask);

-	 #endif

-		 return err;

+	 OtrlPrivKey *p;

+

+	 if (!privf) return gcry_error(GPG_ERR_NO_ERROR);

+

+

+

+	 /* Output the other keys we know */

+	 fprintf(privf, "(privkeys\n");

+	 for (p = us->privkey_root; p; p = p->next) {

+		 otrl_account_write(privf, p->accountname, p->protocol, p->privkey);

 	 }

+	 if (fprintf(privf, ")\n") < 0)

+		 return gcry_error_from_errno(errno);

+	 return gcry_error(GPG_ERR_NO_ERROR);

 

-/* Just store the private keys of an OtrlUserState.

- * The FILE* must be open for reading and writing. */

-	 gcry_error_t otrl_privkey_write_FILEp(OtrlUserState us, FILE *privf)

-	 {

-		 OtrlPrivKey *p;

-		 

-			 if (!privf) return gcry_error(GPG_ERR_NO_ERROR);

-		 

-				 

-			 

-			 /* Output the other keys we know */

-			 fprintf(privf, "(privkeys\n");

-		 for (p=us->privkey_root; p; p=p->next) {

-			 otrl_account_write(privf, p->accountname, p->protocol, p->privkey);

-			 }

-		 if ( fprintf(privf, ")\n") < 0 )

-			 return gcry_error_from_errno(errno);

-		 return gcry_error(GPG_ERR_NO_ERROR);

-		 

-}
\ No newline at end of file
+ }
\ No newline at end of file