summaryrefslogtreecommitdiff
path: root/mysys/my_open.c
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-06-07 12:05:42 +0200
committerunknown <msvensson@neptunus.(none)>2006-06-07 12:05:42 +0200
commit6ce84f2209261cac33e24b06f47766ba06ccba0c (patch)
tree938c149ca1ae61a9f95e995463c6d1817634b72f /mysys/my_open.c
parent8e87d3be42194701757e670bb8da791cb5cdc225 (diff)
parent49cf54d1c99db5d3cfa65452c6b4bbb9aed87fc6 (diff)
downloadmariadb-git-6ce84f2209261cac33e24b06f47766ba06ccba0c.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint include/config-win.h: Auto merged include/my_base.h: Auto merged mysys/my_clock.c: Auto merged mysys/my_copy.c: Auto merged mysys/my_create.c: Auto merged mysys/my_dup.c: Auto merged mysys/my_lib.c: Auto merged mysys/my_open.c: Auto merged mysys/my_redel.c: Auto merged sql/unireg.cc: Auto merged
Diffstat (limited to 'mysys/my_open.c')
-rw-r--r--mysys/my_open.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_open.c b/mysys/my_open.c
index ed323b3b1ad..b070258505a 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#define USES_TYPES
#include "mysys_priv.h"
#include "mysys_err.h"
#include <my_dir.h>