rpms/mysql8.0
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix 32bit-vs-64bit confusion in my_config.h

Browse Source
This commit is contained in:
Tom Lane 2005-12-15 14:20:52 +00:00 committed by Michal Schorm
parent 994e8044f3
commit 59d8e93d3c
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
my_config.h
View File

@ -7,24 +7,18 @@
* Note: this may well fail if user tries to use gcc's -I- option. * Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway. * But that option is deprecated anyway.
*/ */
#ifdef __i386__ #if defined(__x86_64__)
#include "my_config_i386.h"
#endif
#ifdef __x86_64__
#include "my_config_x86_64.h" #include "my_config_x86_64.h"
#endif #elif defined(__ia64__)
#ifdef __ia64__
#include "my_config_ia64.h" #include "my_config_ia64.h"
#endif #elif defined(__i386__)
#ifdef __ppc__ #include "my_config_i386.h"
#include "my_config_ppc.h" #elif defined(__ppc64__)
#endif
#ifdef __ppc64__
#include "my_config_ppc64.h" #include "my_config_ppc64.h"
#endif #elif defined(__ppc__)
#ifdef __s390__ #include "my_config_ppc.h"
#elif defined(__s390x__)
#include "my_config_s390x.h"
#elif defined(__s390__)
#include "my_config_s390.h" #include "my_config_s390.h"
#endif #endif
#ifdef __s390x__
#include "my_config_s390x.h"
#endif

6
mysql.spec
View File

@ -1,6 +1,6 @@
Name: mysql Name: mysql
Version: 5.0.16 Version: 5.0.16
Release: 2 Release: 3
Summary: MySQL client programs and shared libraries. Summary: MySQL client programs and shared libraries.
License: GPL License: GPL
Group: Applications/Databases Group: Applications/Databases
@ -378,6 +378,10 @@ fi
%{_datadir}/sql-bench %{_datadir}/sql-bench
%changelog %changelog
* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-3
- my_config.h needs to guard against 64-bit platforms that also define the
32-bit symbol
* Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 5.0.16-2 * Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 5.0.16-2
- oops, looks like we want uname -i not uname -m - oops, looks like we want uname -i not uname -m