diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /packaging/rpm-uln/my_config.h | |
parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
Diffstat (limited to 'packaging/rpm-uln/my_config.h')
-rw-r--r-- | packaging/rpm-uln/my_config.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/packaging/rpm-uln/my_config.h b/packaging/rpm-uln/my_config.h deleted file mode 100644 index 435a126ac97..00000000000 --- a/packaging/rpm-uln/my_config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Kluge to support multilib installation of both 32- and 64-bit RPMS: - * we need to arrange that header files that appear in both RPMs are - * identical. Hence, this file is architecture-independent and calls - * in an arch-dependent file that will appear in just one RPM. - * - * To avoid breaking arches not explicitly supported by Red Hat, we - * use this indirection file *only* on known multilib arches. - * - * Note: this may well fail if user tries to use gcc's -I- option. - * But that option is deprecated anyway. - */ -#if defined(__x86_64__) -#include "my_config_x86_64.h" -#elif defined(__i386__) -#include "my_config_i386.h" -#elif defined(__ppc64__) || defined(__powerpc64__) -#include "my_config_ppc64.h" -#elif defined(__ppc__) || defined(__powerpc__) -#include "my_config_ppc.h" -#elif defined(__s390x__) -#include "my_config_s390x.h" -#elif defined(__s390__) -#include "my_config_s390.h" -#elif defined(__sparc__) && defined(__arch64__) -#include "my_config_sparc64.h" -#elif defined(__sparc__) -#include "my_config_sparc.h" -#endif |