summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-01-21 20:25:49 +0100
committerunknown <serg@serg.mylan>2004-01-21 20:25:49 +0100
commit9138a61cf8365b4542669b61bd63ca39258b90ac (patch)
tree22825cae81595c51744a90ed44755eaf3046c320
parent9af09d1266c5a354e6126f13feaea0a3680442d3 (diff)
downloadmariadb-git-9138a61cf8365b4542669b61bd63ca39258b90ac.tar.gz
no unnecessary includes (Intel ecc 7.0 compatibility fix)
-rw-r--r--mysys/my_new.cc4
-rw-r--r--mysys/raid.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/mysys/my_new.cc b/mysys/my_new.cc
index 5f2da90bbd1..ec27502d8aa 100644
--- a/mysys/my_new.cc
+++ b/mysys/my_new.cc
@@ -19,9 +19,9 @@
with gcc 3.0.x to avoid including libstdc++
*/
-#include "mysys_priv.h"
+#ifdef USE_MYSYS_NEW
-#ifdef USE_MYSYS_NEW
+#include "mysys_priv.h"
void *operator new (size_t sz)
{
diff --git a/mysys/raid.cc b/mysys/raid.cc
index 0b688464fb3..7eb19ffb16a 100644
--- a/mysys/raid.cc
+++ b/mysys/raid.cc
@@ -70,6 +70,8 @@
tonu@mysql.com & monty@mysql.com
*/
+#if defined(USE_RAID) && !defined(MYSQL_CLIENT)
+
#ifdef __GNUC__
#pragma implementation // gcc: Class implementation
#endif
@@ -79,8 +81,6 @@
#include <m_string.h>
#include <assert.h>
-#if defined(USE_RAID) && !defined(MYSQL_CLIENT)
-
#define RAID_SEEK_DONE ~(off_t) 0
#define RAID_SIZE_UNKNOWN ~(my_off_t) 0