summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-11 20:28:29 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-11 20:28:29 (GMT)
commit683eaf165bf7901fc1bd4f80ab777a3898ba3db9 (patch)
tree9bffefe02a1be7bd8c1b18e8d429f45316f9ecde
parent2e1e85e2fd308e2cfb9eb437d693b6307ad5c7eb (diff)
downloadswift-683eaf165bf7901fc1bd4f80ab777a3898ba3db9.zip
swift-683eaf165bf7901fc1bd4f80ab777a3898ba3db9.tar.bz2
Fixed compilation for newer versions of boost.
This may break VS2008 compilation. If it does, we should add a conditional include path with stdint.h in it.
-rw-r--r--3rdParty/LibIDN/stubs/win32/inttypes.h7
-rw-r--r--3rdParty/LibIDN/stubs/win32/stdint.h40
2 files changed, 7 insertions, 40 deletions
diff --git a/3rdParty/LibIDN/stubs/win32/inttypes.h b/3rdParty/LibIDN/stubs/win32/inttypes.h
index e69de29..22a53b1 100644
--- a/3rdParty/LibIDN/stubs/win32/inttypes.h
+++ b/3rdParty/LibIDN/stubs/win32/inttypes.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#ifdef _WIN64
+typedef __int64 ssize_t;
+#else
+typedef _W64 int ssize_t;
+#endif
diff --git a/3rdParty/LibIDN/stubs/win32/stdint.h b/3rdParty/LibIDN/stubs/win32/stdint.h
deleted file mode 100644
index 6a57ff9..0000000
--- a/3rdParty/LibIDN/stubs/win32/stdint.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
- Written by Adam Strzelecki <ono@java.pl>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License
- as published by the Free Software Foundation; either version 2.1,
- or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
-
-#ifndef _AC_STDINT_H
-#define _AC_STDINT_H 1
-#ifndef _GENERATED_STDINT_H
-#define _GENERATED_STDINT_H
-
-#define uint8_t unsigned char
-#define uint16_t unsigned short
-#define uint32_t unsigned int
-#define int8_t signed char
-#define int16_t signed short
-#define int32_t signed int
-
-#define gint16 int16_t
-
-#ifdef _WIN64
-typedef __int64 ssize_t;
-#else
-typedef _W64 int ssize_t;
-#endif
-
-#endif
-#endif