Simplification [#CLICKHOUSE-3275].

This commit is contained in:
Alexey Milovidov 2017-09-15 08:43:43 +03:00
parent a44208ba25
commit dd8348421c
2 changed files with 15 additions and 38 deletions

View File

@ -1,4 +1,13 @@
#include "glibc-compatibility.h" /** Allows to build programs with libc 2.18 and run on systems with at least libc 2.11,
* such as Ubuntu Lucid or CentOS 6.
*
* Highly experimental, not recommended, disabled by default.
*
* Also look at http://www.lightofdawn.org/wiki/wiki.cgi/NewAppsOnOldGlibc
*
* If you want even older systems, such as Ubuntu Hardy,
* add fallocate, pipe2, __longjmp_chk, __vasprintf_chk.
*/
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
@ -14,6 +23,8 @@ long int __fdelt_chk(long int d)
return d / __NFDBITS; return d / __NFDBITS;
} }
#include <sys/poll.h>
#include <stddef.h>
int __poll_chk(struct pollfd * fds, nfds_t nfds, int timeout, size_t fdslen) int __poll_chk(struct pollfd * fds, nfds_t nfds, int timeout, size_t fdslen)
{ {
@ -22,12 +33,15 @@ int __poll_chk(struct pollfd * fds, nfds_t nfds, int timeout, size_t fdslen)
return poll(fds, nfds, timeout); return poll(fds, nfds, timeout);
} }
#include <pthread.h>
size_t __pthread_get_minstack(const pthread_attr_t * attr) size_t __pthread_get_minstack(const pthread_attr_t * attr)
{ {
return 1048576; /// This is a guess. Don't sure it is correct. return 1048576; /// This is a guess. Don't sure it is correct.
} }
#include <signal.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -1,37 +0,0 @@
#pragma once
/** Allows to build programs with libc 2.18 and run on systems with at least libc 2.11,
* such as Ubuntu Lucid or CentOS 6.
*
* Highly experimental, not recommended, disabled by default.
*
* Also look at http://www.lightofdawn.org/wiki/wiki.cgi/NewAppsOnOldGlibc
*
* If you want even older systems, such as Ubuntu Hardy,
* add fallocate, pipe2, __longjmp_chk, __vasprintf_chk.
*/
#if defined (__cplusplus)
extern "C" {
#endif
__attribute__((__weak__)) long int __fdelt_chk(long int d);
#include <sys/poll.h>
#include <stddef.h>
__attribute__((__weak__)) int __poll_chk(struct pollfd * fds, nfds_t nfds, int timeout, size_t fdslen);
#include <pthread.h>
__attribute__((__weak__)) size_t __pthread_get_minstack(const pthread_attr_t * attr);
#include <signal.h>
#include <unistd.h>
__attribute__((__weak__)) int __gai_sigqueue(int sig, const union sigval val, pid_t caller_pid);
#if defined (__cplusplus)
}
#endif