database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

- Fix compilation error on some platforms

Browse Source 
modified:
  storage/connect/os.h

- Uniforms line endings

modified:
  storage/connect/tabutil.cpp
This commit is contained in:
Olivier Bertrand
2013-09-16 14:59:25 +02:00
parent e57fbef12e
commit c4405fef23
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/os.h
View File

@ -1,7 +1,7 @@
#ifndef _OS_H_INCLUDED #ifndef _OS_H_INCLUDED
#define _OS_H_INCLUDED #define _OS_H_INCLUDED
#if defined(__FreeBSD__) || defined(__APPLE__) #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) || defined(__DragonFly__) || defined(__APPLE__)
typedef off_t off64_t; typedef off_t off64_t;
#define lseek64(fd, offset, whence) lseek((fd), (offset), (whence)) #define lseek64(fd, offset, whence) lseek((fd), (offset), (whence))
#define open64(path, flags, mode) open((path), (flags), (mode)) #define open64(path, flags, mode) open((path), (flags), (mode))

22
storage/connect/tabutil.cpp
View File

@ -591,17 +591,17 @@ bool PRXCOL::Init(PGLOBAL g)
return FALSE; return FALSE;
} // end of Init } // end of Init
/***********************************************************************/ /***********************************************************************/
/* Reset the column descriptor to non evaluated yet. */ /* Reset the column descriptor to non evaluated yet. */
/***********************************************************************/ /***********************************************************************/
void PRXCOL::Reset(void) void PRXCOL::Reset(void)
{ {
if (Colp) if (Colp)
Colp->Reset(); Colp->Reset();
Status &= ~BUF_READ; Status &= ~BUF_READ;
} // end of Reset } // end of Reset
/***********************************************************************/ /***********************************************************************/
/* ReadColumn: */ /* ReadColumn: */
/***********************************************************************/ /***********************************************************************/