From c4405fef23645ad6c4e7d703932a76d1806934e9 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Mon, 16 Sep 2013 14:59:25 +0200 Subject: [PATCH] - Fix compilation error on some platforms modified: storage/connect/os.h - Uniforms line endings modified: storage/connect/tabutil.cpp --- storage/connect/os.h | 2 +- storage/connect/tabutil.cpp | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/storage/connect/os.h b/storage/connect/os.h index 792d1668a91..e1b973e1a17 100644 --- a/storage/connect/os.h +++ b/storage/connect/os.h @@ -1,7 +1,7 @@ #ifndef _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; #define lseek64(fd, offset, whence) lseek((fd), (offset), (whence)) #define open64(path, flags, mode) open((path), (flags), (mode)) diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp index 674a8acf45a..2405b1853a2 100644 --- a/storage/connect/tabutil.cpp +++ b/storage/connect/tabutil.cpp @@ -591,17 +591,17 @@ bool PRXCOL::Init(PGLOBAL g) return FALSE; } // end of Init -/***********************************************************************/ -/* Reset the column descriptor to non evaluated yet. */ -/***********************************************************************/ -void PRXCOL::Reset(void) - { - if (Colp) - Colp->Reset(); - - Status &= ~BUF_READ; - } // end of Reset - +/***********************************************************************/ +/* Reset the column descriptor to non evaluated yet. */ +/***********************************************************************/ +void PRXCOL::Reset(void) + { + if (Colp) + Colp->Reset(); + + Status &= ~BUF_READ; + } // end of Reset + /***********************************************************************/ /* ReadColumn: */ /***********************************************************************/