See ChangeLog entry 2001-04-20 18:05 UTC-0400 David G. Holm <dholm@jsd-llc.com>

This commit is contained in:
David G. Holm
2001-04-20 22:07:09 +00:00
parent 99aa934ff6
commit 252defc0be
8 changed files with 82 additions and 32 deletions

View File

@@ -1,3 +1,16 @@
2001-04-20 18:05 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+ include/hb_io.h
* source/common/hbtrace.c
* source/rtl/console.c
* source/rtl/dir.c
* source/rtl/disksphb.c
* source/rtl/filesys.c
* source/rtl/gtapi.c
+ Instead of using #include <io.h> and/or messy #ifdef blocks to
include <unistd.h> and/or <io.h>, just use #include "hb_io.h"
(based on an idea from Dave Pearson).
2001-04-20 19:00 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
* contrib/libmisc/dbftools.c
* fieldtype() fixed accordingly to RDD changes

63
harbour/include/hb_io.h Normal file
View File

@@ -0,0 +1,63 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* A platform indpendent include file to include unistd.h and/or io.h
*
* Copyright 2001 Harbour Project
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#ifndef HB__IO_H_
#define HB__IO_H_
#if defined(__GNUC__) && ! defined(__MINGW32__)
#include <unistd.h>
#endif
#if !defined(OS_UNIX_COMPATIBLE)
#include <io.h>
#endif
#endif

View File

@@ -54,9 +54,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <io.h>
#include "hbapi.h"
#include "hb_io.h"
#include "hbtrace.h"
char * hb_tr_file_ = "";

View File

@@ -74,13 +74,7 @@
#include "hbapifs.h"
#include "hbapigt.h"
#include "hbset.h"
#if defined(__GNUC__) && ! defined(__MINGW32__)
#include <unistd.h>
#endif
#if !defined(OS_UNIX_COMPATIBLE)
#include <io.h>
#endif
#include "hb_io.h"
/* length of buffer for CR/LF characters */
#define CRLF_BUFFER_LEN OS_EOL_LEN + 1

View File

@@ -90,21 +90,17 @@
#include "hbapi.h"
#include "hbapiitm.h"
#include "hb_io.h"
#include "directry.ch"
#if defined(__GNUC__) && !defined(__MINGW32__)
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <dirent.h>
#include <time.h>
#if !defined(OS_UNIX_COMPATIBLE)
#include <io.h>
#endif
#if !defined(HAVE_POSIX_IO)
#define HAVE_POSIX_IO
#endif
@@ -114,7 +110,6 @@
#include <sys/stat.h>
#include <share.h>
#include <fcntl.h>
#include <io.h>
#include <errno.h>
#include <direct.h>
#include <time.h>
@@ -126,7 +121,6 @@
#include <sys/stat.h>
#include <share.h>
#include <fcntl.h>
#include <io.h>
#include <errno.h>
#include <direct.h>
#include <time.h>
@@ -148,7 +142,6 @@
#if defined(__BORLANDC__)
#include <sys\stat.h>
#include <io.h>
#include <fcntl.h>
#include <share.h>
#include <dirent.h>

View File

@@ -104,7 +104,7 @@ HB_FUNC( HB_DISKSPACE )
}
else
{
if( hb_errRT_BASE_Ext1( EG_OPEN, 2018, NULL, NULL, 0, EF_CANDEFAULT | EF_CANRETRY ) == E_RETRY, 2, hb_paramError( 1 ), hb_paramError( 2 ) )
if( hb_errRT_BASE_Ext1( EG_OPEN, 2018, NULL, NULL, 0, ( EF_CANDEFAULT | EF_CANRETRY ) == E_RETRY, 2, hb_paramError( 1 ), hb_paramError( 2 ) ) )
continue;
}
break;

View File

@@ -77,17 +77,14 @@
#include "hbapi.h"
#include "hbapifs.h"
#include "hb_io.h"
#if defined(__GNUC__) && !defined(__MINGW32__)
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#if !defined(OS_UNIX_COMPATIBLE)
#include <io.h>
#endif
#if defined(__DJGPP__)
#include <dir.h>
#define _getdrive getdisk
@@ -106,7 +103,6 @@
#include <sys/stat.h>
#include <share.h>
#include <fcntl.h>
#include <io.h>
#include <direct.h>
#include <errno.h>
#include <dos.h>
@@ -121,7 +117,6 @@
#include <sys\stat.h>
#include <share.h>
#include <fcntl.h>
#include <io.h>
#include <direct.h>
#if defined(__BORLANDC__)
#include <dir.h>

View File

@@ -55,19 +55,11 @@
*
*/
#if defined(__GNUC__) && ! defined(__MINGW32__)
#include <unistd.h>
#if defined(__DJGPP__) || defined(__CYGWIN__) || defined(__EMX__)
#include <io.h>
#endif
#else
#include <io.h>
#endif
#include <ctype.h>
#include "hbapigt.h"
#include "hbset.h"
#include "hb_io.h"
static BOOL s_bInit = FALSE;