Merge pull request #10642 from ydb-platform/mergelibs-241019-1758

Library import 241019-1758

1 files changed, 3 insertions, 146 deletions

diff --git a/contrib/libs/c-ares/src/lib/ares_setup.h b/contrib/libs/c-ares/src/lib/ares_setup.h
index d771e4e141..604851b318 100644
--- a/contrib/libs/c-ares/src/lib/ares_setup.h
+++ b/contrib/libs/c-ares/src/lib/ares_setup.h
@@ -199,51 +199,15 @@
 #endif
 
 
-#ifdef __hpux
-#  if !defined(_XOPEN_SOURCE_EXTENDED) || defined(_KERNEL)
-#    ifdef _APP32_64BIT_OFF_T
-#      define OLD_APP32_64BIT_OFF_T _APP32_64BIT_OFF_T
-#      undef _APP32_64BIT_OFF_T
-#    else
-#      undef OLD_APP32_64BIT_OFF_T
-#    endif
-#  endif
-#endif
-
-#ifdef __hpux
-#  if !defined(_XOPEN_SOURCE_EXTENDED) || defined(_KERNEL)
-#    ifdef OLD_APP32_64BIT_OFF_T
-#      define _APP32_64BIT_OFF_T OLD_APP32_64BIT_OFF_T
-#      undef OLD_APP32_64BIT_OFF_T
-#    endif
-#  endif
-#endif
-
-
-/*
- * Definition of timeval struct for platforms that don't have it.
- */
+/* Definition of timeval struct for platforms that don't have it. */
 
 #ifndef HAVE_STRUCT_TIMEVAL
 struct timeval {
-  long tv_sec;
-  long tv_usec;
+  ares_int64_t tv_sec;
+  long         tv_usec;
 };
 #endif
 
-/*
- * Function-like macro definition used to close a socket.
- */
-
-#if defined(HAVE_CLOSESOCKET)
-#  define sclose(x) closesocket((x))
-#elif defined(HAVE_CLOSESOCKET_CAMEL)
-#  define sclose(x) CloseSocket((x))
-#elif defined(HAVE_CLOSE_S)
-#  define sclose(x) close_s((x))
-#else
-#  define sclose(x) close((x))
-#endif
 
 /*
  * Macro used to include code only in debug builds.
@@ -257,111 +221,4 @@ struct timeval {
     } while (0)
 #endif
 
-/*
- * Macro SOCKERRNO / SET_SOCKERRNO() returns / sets the *socket-related* errno
- * (or equivalent) on this platform to hide platform details to code using it.
- */
-
-#ifdef USE_WINSOCK
-#  define SOCKERRNO        ((int)WSAGetLastError())
-#  define SET_SOCKERRNO(x) (WSASetLastError((int)(x)))
-#else
-#  define SOCKERRNO        (errno)
-#  define SET_SOCKERRNO(x) (errno = (x))
-#endif
-
-
-/*
- * Macro ERRNO / SET_ERRNO() returns / sets the NOT *socket-related* errno
- * (or equivalent) on this platform to hide platform details to code using it.
- */
-
-#if defined(WIN32) && !defined(WATT32)
-#  define ERRNO        ((int)GetLastError())
-#  define SET_ERRNO(x) (SetLastError((DWORD)(x)))
-#else
-#  define ERRNO        (errno)
-#  define SET_ERRNO(x) (errno = (x))
-#endif
-
-
-/*
- * Portable error number symbolic names defined to Winsock error codes.
- */
-
-#ifdef USE_WINSOCK
-#  undef EBADF           /* override definition in errno.h */
-#  define EBADF WSAEBADF
-#  undef EINTR           /* override definition in errno.h */
-#  define EINTR WSAEINTR
-#  undef EINVAL          /* override definition in errno.h */
-#  define EINVAL WSAEINVAL
-#  undef EWOULDBLOCK     /* override definition in errno.h */
-#  define EWOULDBLOCK WSAEWOULDBLOCK
-#  undef EINPROGRESS     /* override definition in errno.h */
-#  define EINPROGRESS WSAEINPROGRESS
-#  undef EALREADY        /* override definition in errno.h */
-#  define EALREADY WSAEALREADY
-#  undef ENOTSOCK        /* override definition in errno.h */
-#  define ENOTSOCK WSAENOTSOCK
-#  undef EDESTADDRREQ    /* override definition in errno.h */
-#  define EDESTADDRREQ WSAEDESTADDRREQ
-#  undef EMSGSIZE        /* override definition in errno.h */
-#  define EMSGSIZE WSAEMSGSIZE
-#  undef EPROTOTYPE      /* override definition in errno.h */
-#  define EPROTOTYPE WSAEPROTOTYPE
-#  undef ENOPROTOOPT     /* override definition in errno.h */
-#  define ENOPROTOOPT WSAENOPROTOOPT
-#  undef EPROTONOSUPPORT /* override definition in errno.h */
-#  define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#  define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-#  undef EOPNOTSUPP /* override definition in errno.h */
-#  define EOPNOTSUPP   WSAEOPNOTSUPP
-#  define EPFNOSUPPORT WSAEPFNOSUPPORT
-#  undef EAFNOSUPPORT  /* override definition in errno.h */
-#  define EAFNOSUPPORT WSAEAFNOSUPPORT
-#  undef EADDRINUSE    /* override definition in errno.h */
-#  define EADDRINUSE WSAEADDRINUSE
-#  undef EADDRNOTAVAIL /* override definition in errno.h */
-#  define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-#  undef ENETDOWN      /* override definition in errno.h */
-#  define ENETDOWN WSAENETDOWN
-#  undef ENETUNREACH   /* override definition in errno.h */
-#  define ENETUNREACH WSAENETUNREACH
-#  undef ENETRESET     /* override definition in errno.h */
-#  define ENETRESET WSAENETRESET
-#  undef ECONNABORTED  /* override definition in errno.h */
-#  define ECONNABORTED WSAECONNABORTED
-#  undef ECONNRESET    /* override definition in errno.h */
-#  define ECONNRESET WSAECONNRESET
-#  undef ENOBUFS       /* override definition in errno.h */
-#  define ENOBUFS WSAENOBUFS
-#  undef EISCONN       /* override definition in errno.h */
-#  define EISCONN WSAEISCONN
-#  undef ENOTCONN      /* override definition in errno.h */
-#  define ENOTCONN     WSAENOTCONN
-#  define ESHUTDOWN    WSAESHUTDOWN
-#  define ETOOMANYREFS WSAETOOMANYREFS
-#  undef ETIMEDOUT     /* override definition in errno.h */
-#  define ETIMEDOUT WSAETIMEDOUT
-#  undef ECONNREFUSED  /* override definition in errno.h */
-#  define ECONNREFUSED WSAECONNREFUSED
-#  undef ELOOP         /* override definition in errno.h */
-#  define ELOOP WSAELOOP
-#  ifndef ENAMETOOLONG /* possible previous definition in errno.h */
-#    define ENAMETOOLONG WSAENAMETOOLONG
-#  endif
-#  define EHOSTDOWN WSAEHOSTDOWN
-#  undef EHOSTUNREACH /* override definition in errno.h */
-#  define EHOSTUNREACH WSAEHOSTUNREACH
-#  ifndef ENOTEMPTY   /* possible previous definition in errno.h */
-#    define ENOTEMPTY WSAENOTEMPTY
-#  endif
-#  define EPROCLIM WSAEPROCLIM
-#  define EUSERS   WSAEUSERS
-#  define EDQUOT   WSAEDQUOT
-#  define ESTALE   WSAESTALE
-#  define EREMOTE  WSAEREMOTE
-#endif
-
 #endif /* __ARES_SETUP_H */