mirror of
https://github.com/MariaDB/server.git
synced 2026-04-23 16:55:31 +02:00
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1 sql/ha_myisammrg.cc: Auto merged
This commit is contained in:
commit
cc78467d3a
52 changed files with 105 additions and 65 deletions
|
|
@ -48,6 +48,11 @@
|
|||
#define USE_PRAGMA_INTERFACE
|
||||
#endif
|
||||
|
||||
/* Determine when to use "#pragma implementation" */
|
||||
#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
|
||||
#define USE_PRAGMA_IMPLEMENTATION
|
||||
#endif
|
||||
|
||||
#if defined(i386) && !defined(__i386__)
|
||||
#define __i386__
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue