diff options
author | René Schümann <white06tiger@gmail.com> | 2015-03-20 12:32:51 +0000 |
---|---|---|
committer | René Schümann <white06tiger@gmail.com> | 2015-03-20 12:32:51 +0000 |
commit | 7c2e448fa7e1339da2937ef0b41a45ba1d01f87b (patch) | |
tree | d909494486ab5bf7d1126202cee14954702b1bf6 /plugins/MirOTR/libotr | |
parent | 539705d58fc39a28388ff18c695dd406f4ffd1d9 (diff) |
MirOTR: added DEPENDENCIES.txt with information about MirOTR's dependencies incl. how to build/update them.
- removed seemingly unneeded libotr/inc directory
- removed _CRT_SECURE_NO_WARNINGS define from MirOTR stdafx.h as it's not needed there.
git-svn-id: http://svn.miranda-ng.org/main/trunk@12450 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/libotr')
-rw-r--r-- | plugins/MirOTR/libotr/inc/sys/errno.h | 0 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/inc/sys/ipc.h | 0 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/inc/sys/socket.h | 0 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/inc/sys/time.h | 2 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/inc/sys/types.h | 49 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/inc/sys/un.h | 0 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/inc/unistd.h | 61 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/libotr_10.vcxproj | 8 | ||||
-rw-r--r-- | plugins/MirOTR/libotr/libotr_12.vcxproj | 8 |
9 files changed, 8 insertions, 120 deletions
diff --git a/plugins/MirOTR/libotr/inc/sys/errno.h b/plugins/MirOTR/libotr/inc/sys/errno.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/plugins/MirOTR/libotr/inc/sys/errno.h +++ /dev/null diff --git a/plugins/MirOTR/libotr/inc/sys/ipc.h b/plugins/MirOTR/libotr/inc/sys/ipc.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/plugins/MirOTR/libotr/inc/sys/ipc.h +++ /dev/null diff --git a/plugins/MirOTR/libotr/inc/sys/socket.h b/plugins/MirOTR/libotr/inc/sys/socket.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/plugins/MirOTR/libotr/inc/sys/socket.h +++ /dev/null diff --git a/plugins/MirOTR/libotr/inc/sys/time.h b/plugins/MirOTR/libotr/inc/sys/time.h deleted file mode 100644 index 038cf1f387..0000000000 --- a/plugins/MirOTR/libotr/inc/sys/time.h +++ /dev/null @@ -1,2 +0,0 @@ -
-#include <time.h>
\ No newline at end of file diff --git a/plugins/MirOTR/libotr/inc/sys/types.h b/plugins/MirOTR/libotr/inc/sys/types.h deleted file mode 100644 index 5a3e51c4a9..0000000000 --- a/plugins/MirOTR/libotr/inc/sys/types.h +++ /dev/null @@ -1,49 +0,0 @@ -
-#pragma once
-
-#include "..\unistd.h"
-
-
-#ifndef _TIME_T_DEFINED
-typedef long time_t;
-#define _TIME_T_DEFINED
-#endif
-
-
-#ifndef _INO_T_DEFINED
-
-typedef unsigned short _ino_t; /* i-node number (not used on DOS) */
-
-#if !__STDC__
-/* Non-ANSI name for compatibility */
-typedef unsigned short ino_t;
-#endif
-
-#define _INO_T_DEFINED
-#endif
-
-
-#ifndef _DEV_T_DEFINED
-
-typedef unsigned int _dev_t; /* device code */
-
-#if !__STDC__
-/* Non-ANSI name for compatibility */
-typedef unsigned int dev_t;
-#endif
-
-#define _DEV_T_DEFINED
-#endif
-
-
-#ifndef _OFF_T_DEFINED
-
-typedef long _off_t; /* file offset value */
-
-#if !__STDC__
-/* Non-ANSI name for compatibility */
-typedef long off_t;
-#endif
-
-#define _OFF_T_DEFINED
-#endif
diff --git a/plugins/MirOTR/libotr/inc/sys/un.h b/plugins/MirOTR/libotr/inc/sys/un.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/plugins/MirOTR/libotr/inc/sys/un.h +++ /dev/null diff --git a/plugins/MirOTR/libotr/inc/unistd.h b/plugins/MirOTR/libotr/inc/unistd.h deleted file mode 100644 index 6fe3882660..0000000000 --- a/plugins/MirOTR/libotr/inc/unistd.h +++ /dev/null @@ -1,61 +0,0 @@ -
-#pragma once
-
-#include <basetsd.h>
-#include <stddef.h>
-#include <errno.h>
-#include <time.h>
-
-#ifndef S_IWUSR
-#define S_IWUSR _S_IWRITE
-#endif
-
-#ifndef S_IRUSR
-#define S_IRUSR _S_IREAD
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(A) (1)
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#define _SIZE_T_DEFINED
-#endif
-
-#ifndef _SSIZE_T_DEFINED
-typedef signed int ssize_t;
-#define _SSIZE_T_DEFINED
-#endif
-
-#ifndef _PID_T_DEFINED
-typedef int pid_t;
-#define _PID_T_DEFINED
-#endif
-
-#ifndef offsetof
-#define offsetof(type, member) ((size_t) &((type *)0)->member)
-#endif
-
-/* Define to `int' if unavailable. */
-#ifndef socklen_t
-#define socklen_t int
-#endif
-
-#ifndef strcasecmp
-#define strcasecmp stricmp
-#endif
-
-#ifndef strncasecmp
-#define strncasecmp strnicmp
-#endif
-
-// !s0rr0w!
-#define SIZEOF_UINT64_T 8
-#define UINT64_C(C) (C)
-typedef unsigned __int64 uint64_t;
-
-#define _WIN32_WINNT 0x500
-#include <windows.h>
-
-#pragma warning(disable : 4786)
diff --git a/plugins/MirOTR/libotr/libotr_10.vcxproj b/plugins/MirOTR/libotr/libotr_10.vcxproj index 1a8511e061..ed769ffd25 100644 --- a/plugins/MirOTR/libotr/libotr_10.vcxproj +++ b/plugins/MirOTR/libotr/libotr_10.vcxproj @@ -71,7 +71,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -88,7 +88,7 @@ <ClCompile>
<AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -103,7 +103,7 @@ <ClCompile>
<AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -118,7 +118,7 @@ <ClCompile>
<AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FloatingPointModel>Fast</FloatingPointModel>
diff --git a/plugins/MirOTR/libotr/libotr_12.vcxproj b/plugins/MirOTR/libotr/libotr_12.vcxproj index c928fa9811..8698501aca 100644 --- a/plugins/MirOTR/libotr/libotr_12.vcxproj +++ b/plugins/MirOTR/libotr/libotr_12.vcxproj @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -88,7 +88,7 @@ <ClCompile>
<AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -99,7 +99,7 @@ <ClCompile>
<AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -110,7 +110,7 @@ <ClCompile>
<AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>custom;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FloatingPointModel>Fast</FloatingPointModel>
|