Restoring authorship annotation for <denplusplus@yandex-team.ru>. Commit 2 of 2.

3 files changed, 327 insertions, 327 deletions

diff --git a/contrib/libs/libidn/unix/ac-stdint.h b/contrib/libs/libidn/unix/ac-stdint.h
index 9d97f0eec5..b80507276a 100644
--- a/contrib/libs/libidn/unix/ac-stdint.h
+++ b/contrib/libs/libidn/unix/ac-stdint.h
@@ -1,43 +1,43 @@
-/* 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 
- 
-#if defined(__GNUC__) && (__GNUC__ < 4) 
-#   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 
-#else 
-#   include <stdint.h> 
-#endif 
-/* 
-#ifdef  _WIN64 
-typedef __int64		ssize_t; 
-#else 
-typedef _W64 int	ssize_t; 
-#endif 
-*/ 
-#endif 
-#endif 
+/* 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
+
+#if defined(__GNUC__) && (__GNUC__ < 4)
+#   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
+#else
+#   include <stdint.h>
+#endif
+/*
+#ifdef  _WIN64
+typedef __int64		ssize_t;
+#else
+typedef _W64 int	ssize_t;
+#endif
+*/
+#endif
+#endif
diff --git a/contrib/libs/libidn/unix/config.h b/contrib/libs/libidn/unix/config.h
index 9767016828..0b4dad46a2 100644
--- a/contrib/libs/libidn/unix/config.h
+++ b/contrib/libs/libidn/unix/config.h
@@ -1,269 +1,269 @@
-/* config.h.  Generated from config.h.in by configure.  */ 
-/* config.h.in.  Generated from configure.ac by autoheader.  */ 
- 
-/* Define if mono is the preferred C# implementation. */ 
-/* #undef CSHARP_CHOICE_MONO */ 
- 
-/* Define if pnet is the preferred C# implementation. */ 
-/* #undef CSHARP_CHOICE_PNET */ 
- 
-/* Define to 1 if translation of program messages to the user's native 
-   language is requested. */ 
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if mono is the preferred C# implementation. */
+/* #undef CSHARP_CHOICE_MONO */
+
+/* Define if pnet is the preferred C# implementation. */
+/* #undef CSHARP_CHOICE_PNET */
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
 //#define ENABLE_NLS 1
- 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the 
-   CoreFoundation framework. */ 
-/* #undef HAVE_CFLOCALECOPYCURRENT */ 
- 
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in 
-   the CoreFoundation framework. */ 
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ 
- 
-/* Define if the GNU dcgettext() function is already present or preinstalled. 
-   */ 
+
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
 //#define HAVE_DCGETTEXT 1
- 
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. 
-   */ 
-#define HAVE_DECL_GETENV 1 
- 
-/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't. 
-   */ 
-#define HAVE_DECL_STRDUP 1 
- 
-/* Define to 1 if you have the declaration of `strerror', and to 0 if you 
-   don't. */ 
-/* #undef HAVE_DECL_STRERROR */ 
- 
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you 
-   don't. */ 
-#define HAVE_DECL_STRERROR_R 1 
- 
-/* Define to 1 if you have the <dlfcn.h> header file. */ 
-#define HAVE_DLFCN_H 1 
- 
-/* Define to 1 if you have the <getopt.h> header file. */ 
-#define HAVE_GETOPT_H 1 
- 
-/* Define to 1 if you have the `getopt_long_only' function. */ 
-#define HAVE_GETOPT_LONG_ONLY 1 
- 
-/* Define if the GNU gettext() function is already present or preinstalled. */ 
-#define HAVE_GETTEXT 0 
- 
-/* Define if you have the iconv() function and it works. */ 
-#define HAVE_ICONV 0 
- 
-/* Define to 1 if you have the <iconv.h> header file. */ 
-#define HAVE_ICONV_H 0 
- 
-/* Define if your compiler supports the #include_next directive. */ 
-#define HAVE_INCLUDE_NEXT 1 
- 
-/* Define to 1 if you have the <inttypes.h> header file. */ 
-#define HAVE_INTTYPES_H 1 
- 
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ 
-#define HAVE_LANGINFO_CODESET 1 
- 
-/* Define to 1 if the system has the type `long long int'. */ 
-#define HAVE_LONG_LONG_INT 1 
- 
-/* Define if the 'malloc' function is POSIX compliant. */ 
-#define HAVE_MALLOC_POSIX 1 
- 
-/* Define to 1 if you have the <memory.h> header file. */ 
-#define HAVE_MEMORY_H 1 
- 
-/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ 
-#define HAVE_SIGNED_SIG_ATOMIC_T 1 
- 
-/* Define to 1 if 'wchar_t' is a signed integer type. */ 
-#define HAVE_SIGNED_WCHAR_T 1 
- 
-/* Define to 1 if 'wint_t' is a signed integer type. */ 
-#define HAVE_SIGNED_WINT_T 1 
- 
-/* Define to 1 if you have the <stdarg.h> header file. */ 
-#define HAVE_STDARG_H 1 
- 
-/* Define to 1 if stdbool.h conforms to C99. */ 
-#define HAVE_STDBOOL_H 1 
- 
-/* Define to 1 if you have the <stdint.h> header file. */ 
-#define HAVE_STDINT_H 1 
- 
-/* Define to 1 if you have the <stdlib.h> header file. */ 
-#define HAVE_STDLIB_H 1 
- 
-/* Define to 1 if you have the `strdup' function. */ 
-#define HAVE_STRDUP 1 
- 
-/* Define to 1 if you have the `strerror_r' function. */ 
-#define HAVE_STRERROR_R 1 
- 
-/* Define to 1 if you have the <strings.h> header file. */ 
-#define HAVE_STRINGS_H 1 
- 
-/* Define to 1 if you have the <string.h> header file. */ 
-#define HAVE_STRING_H 1 
- 
-/* Define to 1 if you have the `strverscmp' function. */ 
-/* #undef HAVE_STRVERSCMP */ 
- 
-/* Define to 1 if you have the <sys/bitypes.h> header file. */ 
-/* #undef HAVE_SYS_BITYPES_H */ 
- 
-/* Define to 1 if you have the <sys/inttypes.h> header file. */ 
-/* #undef HAVE_SYS_INTTYPES_H */ 
- 
-/* Define to 1 if you have the <sys/stat.h> header file. */ 
-#define HAVE_SYS_STAT_H 1 
- 
-/* Define to 1 if you have the <sys/types.h> header file. */ 
-#define HAVE_SYS_TYPES_H 1 
- 
-/* Define to 1 if you have the <unistd.h> header file. */ 
-#define HAVE_UNISTD_H 1 
- 
-/* Define to 1 if the system has the type `unsigned long long int'. */ 
-#define HAVE_UNSIGNED_LONG_LONG_INT 1 
- 
-/* Define to 1 if you have the <wchar.h> header file. */ 
-#define HAVE_WCHAR_H 1 
- 
-/* Define if you have the 'wchar_t' type. */ 
-#define HAVE_WCHAR_T 1 
- 
-/* Define if you have the 'wint_t' type. */ 
-#define HAVE_WINT_T 1 
- 
-/* Define to 1 if the system has the type `_Bool'. */ 
-#define HAVE__BOOL 1 
- 
-/* Define as const if the declaration of iconv() needs const. */ 
-#define ICONV_CONST const 
- 
-/* Define to a symbolic name denoting the flavor of iconv_open() 
-   implementation. */ 
-/* #undef ICONV_FLAVOR */ 
- 
-/* Name of package */ 
-#define PACKAGE "libidn" 
- 
-/* Define to the address where bug reports for this package should be sent. */ 
-#define PACKAGE_BUGREPORT "bug-libidn@gnu.org" 
- 
-/* Define to the full name of this package. */ 
-#define PACKAGE_NAME "GNU Libidn" 
- 
-/* Define to the full name and version of this package. */ 
-#define PACKAGE_STRING "GNU Libidn 1.9" 
- 
-/* Define to the one symbol short name of this package. */ 
-#define PACKAGE_TARNAME "libidn" 
- 
-/* Define to the version of this package. */ 
-#define PACKAGE_VERSION "1.9" 
- 
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 
-   'ptrdiff_t'. */ 
-#define PTRDIFF_T_SUFFIX l 
- 
-/* Define this to 1 if strerror is broken. */ 
-/* #undef REPLACE_STRERROR */ 
- 
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 
-   'sig_atomic_t'. */ 
-#define SIG_ATOMIC_T_SUFFIX l 
- 
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 
-   'size_t'. */ 
-#define SIZE_T_SUFFIX ul 
- 
-/* Define to 1 if you have the ANSI C header files. */ 
-#define STDC_HEADERS 1 
- 
-/* Define to 1 if strerror_r returns char *. */ 
-/* #undef STRERROR_R_CHAR_P */ 
- 
-/* Version number of package */ 
-#define VERSION "1.9" 
- 
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 
-   'wchar_t'. */ 
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#define HAVE_DECL_GETENV 1
+
+/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't.
+   */
+#define HAVE_DECL_STRDUP 1
+
+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_STRERROR */
+
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRERROR_R 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getopt_long_only' function. */
+#define HAVE_GETOPT_LONG_ONLY 1
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 0
+
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 0
+
+/* Define to 1 if you have the <iconv.h> header file. */
+#define HAVE_ICONV_H 0
+
+/* Define if your compiler supports the #include_next directive. */
+#define HAVE_INCLUDE_NEXT 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#define HAVE_LANGINFO_CODESET 1
+
+/* Define to 1 if the system has the type `long long int'. */
+#define HAVE_LONG_LONG_INT 1
+
+/* Define if the 'malloc' function is POSIX compliant. */
+#define HAVE_MALLOC_POSIX 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
+#define HAVE_SIGNED_SIG_ATOMIC_T 1
+
+/* Define to 1 if 'wchar_t' is a signed integer type. */
+#define HAVE_SIGNED_WCHAR_T 1
+
+/* Define to 1 if 'wint_t' is a signed integer type. */
+#define HAVE_SIGNED_WINT_T 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strverscmp' function. */
+/* #undef HAVE_STRVERSCMP */
+
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+/* #undef HAVE_SYS_BITYPES_H */
+
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+/* #undef HAVE_SYS_INTTYPES_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define if you have the 'wchar_t' type. */
+#define HAVE_WCHAR_T 1
+
+/* Define if you have the 'wint_t' type. */
+#define HAVE_WINT_T 1
+
+/* Define to 1 if the system has the type `_Bool'. */
+#define HAVE__BOOL 1
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST const
+
+/* Define to a symbolic name denoting the flavor of iconv_open()
+   implementation. */
+/* #undef ICONV_FLAVOR */
+
+/* Name of package */
+#define PACKAGE "libidn"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "bug-libidn@gnu.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU Libidn"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU Libidn 1.9"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libidn"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.9"
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'ptrdiff_t'. */
+#define PTRDIFF_T_SUFFIX l
+
+/* Define this to 1 if strerror is broken. */
+/* #undef REPLACE_STRERROR */
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'sig_atomic_t'. */
+#define SIG_ATOMIC_T_SUFFIX l
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'size_t'. */
+#define SIZE_T_SUFFIX ul
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if strerror_r returns char *. */
+/* #undef STRERROR_R_CHAR_P */
+
+/* Version number of package */
+#define VERSION "1.9"
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wchar_t'. */
 #define WCHAR_T_SUFFIX
- 
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 
-   'wint_t'. */ 
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wint_t'. */
 #define WINT_T_SUFFIX
- 
-/* Define to 1 if you want TLD code. */ 
-#define WITH_TLD 1 
- 
-/* Define to 1 if on MINIX. */ 
-/* #undef _MINIX */ 
- 
-/* Define to 2 if the system does not provide POSIX.1 features except with 
-   this defined. */ 
-/* #undef _POSIX_1_SOURCE */ 
- 
-/* Define to 1 if you need to in order for `stat' and other things to work. */ 
-/* #undef _POSIX_SOURCE */ 
- 
-/* Enable extensions on AIX 3, Interix.  */ 
-#ifndef _ALL_SOURCE 
-# define _ALL_SOURCE 1 
-#endif 
-/* Enable GNU extensions on systems that have them.  */ 
-#ifndef _GNU_SOURCE 
-# define _GNU_SOURCE 1 
-#endif 
-/* Enable threading extensions on Solaris.  */ 
-#ifndef _POSIX_PTHREAD_SEMANTICS 
-# define _POSIX_PTHREAD_SEMANTICS 1 
-#endif 
-/* Enable extensions on HP NonStop.  */ 
-#ifndef _TANDEM_SOURCE 
-# define _TANDEM_SOURCE 1 
-#endif 
-/* Enable general extensions on Solaris.  */ 
-#ifndef __EXTENSIONS__ 
-# define __EXTENSIONS__ 1 
-#endif 
- 
- 
-/* Define to rpl_ if the getopt replacement functions and variables should be 
-   used. */ 
-#define __GETOPT_PREFIX rpl_ 
- 
-/* A replacement for va_copy, if needed.  */ 
-#define gl_va_copy(a,b) ((a) = (b)) 
- 
-/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports 
-   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of 
-   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. 
-   __APPLE__ && __MACH__ test for MacOS X. 
-   __APPLE_CC__ tests for the Apple compiler and its version. 
-   __STDC_VERSION__ tests for the C99 mode.  */ 
-#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ 
-# define __GNUC_STDC_INLINE__ 1 
-#endif 
- 
-/* Define to the equivalent of the C99 'restrict' keyword, or to 
-   nothing if this is not supported.  Do not define if restrict is 
-   supported directly.  */ 
-#define restrict __restrict 
-/* Work around a bug in Sun C++: it does not support _Restrict, even 
-   though the corresponding Sun C compiler does, which causes 
-   "#define restrict _Restrict" in the previous line.  Perhaps some future 
-   version of Sun C++ will work with _Restrict; if so, it'll probably 
-   define __RESTRICT, just as Sun C does.  */ 
-#if defined __SUNPRO_CC && !defined __RESTRICT 
-# define _Restrict 
-#endif 
- 
-/* Define as a macro for copying va_list variables. */ 
-/* #undef va_copy */ 
- 
-#define LOCALEDIR "." 
+
+/* Define to 1 if you want TLD code. */
+#define WITH_TLD 1
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+#define __GETOPT_PREFIX rpl_
+
+/* A replacement for va_copy, if needed.  */
+#define gl_va_copy(a,b) ((a) = (b))
+
+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for MacOS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#define restrict __restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif
+
+/* Define as a macro for copying va_list variables. */
+/* #undef va_copy */
+
+#define LOCALEDIR "."
diff --git a/contrib/libs/libidn/unix/idn-int.h b/contrib/libs/libidn/unix/idn-int.h
index 7736c7cbe0..3339e2de1d 100644
--- a/contrib/libs/libidn/unix/idn-int.h
+++ b/contrib/libs/libidn/unix/idn-int.h
@@ -1,19 +1,19 @@
-/* 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.  */ 
- 
-#include "ac-stdint.h" 
+/* 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.  */
+
+#include "ac-stdint.h"