firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:43:03 +01:00
Code Issues

Cleaned up some include directives after renaming jrd_time.h.

Browse Source
This commit is contained in:
bellardo 2002-09-27 01:28:27 +00:00
parent 5fdc766bda
commit 79a6e8b099
5 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/cvt.cpp
View File

@ -69,15 +69,6 @@
# endif
#endif
#ifdef HAVE_TIME_H
#ifdef DARWIN
#include </usr/include/time.h>
#endif
#if defined DARWIN && !defined _TIME_H_
#error john
#endif
#endif
#if !(defined REQUESTER && defined SUPERCLIENT)
#include "../jrd/intl_classes.h"
#endif

6
src/jrd/evl.cpp
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: evl.cpp,v 1.16 2002-09-27 00:20:08 bellardo Exp $
* $Id: evl.cpp,v 1.17 2002-09-27 01:28:26 bellardo Exp $
*/
/*
@ -107,10 +107,6 @@
#include "../jrd/cvt_proto.h"
//#include "../jrd/authenticate.h"
#ifdef DARWIN
#include </usr/include/time.h>
#endif
#if defined(WIN_NT) && defined(_MSC_VER)
#pragma warning(disable: 4244)
#endif

6
src/jrd/exe.cpp
View File

@ -31,7 +31,7 @@
* to count virtual operations, not real I/O on the underlying tables.
*/
/*
$Id: exe.cpp,v 1.18 2002-09-25 17:12:09 skidder Exp $
$Id: exe.cpp,v 1.19 2002-09-27 01:28:26 bellardo Exp $
*/
#include "firebird.h"
@ -96,10 +96,6 @@ $Id: exe.cpp,v 1.18 2002-09-25 17:12:09 skidder Exp $
#include "TestStck.h"
#endif
#ifdef DARWIN
#include </usr/include/time.h>
#endif
extern "C" {

1
src/jrd/gds.cpp
View File

@ -62,7 +62,6 @@
#ifdef DARWIN
#include <CoreFoundation/CFBundle.h>
#include <CoreFoundation/CFURL.h>
#include </usr/include/time.h>
#endif
#if (defined PC_PLATFORM && !defined NETWARE_386)

60
src/jrd/jrd_time.h Normal file
View File

@ -0,0 +1,60 @@
/*
* PROGRAM: JRD Access Method
* MODULE: time.h
* DESCRIPTION: OS independent time include file
*
* The contents of this file are subject to the Interbase Public
* License Version 1.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy
* of the License at http://www.Inprise.com/IPL.html
*
* Software distributed under the License is distributed on an
* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
* or implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code was created by Inprise Corporation
* and its predecessors. Portions created by Inprise Corporation are
* Copyright (C) Inprise Corporation.
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
#ifndef _JRD_TIME_H_
#define _JRD_TIME_H_
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#ifdef HAVE_LIBIO_H /* was linux only - I really wonder if it is actuall y needed*/
#include <libio.h>
#endif
/* This is the number of seconds in a day */
#define ONE_DAY 86400
/* MIN_YEAR and MAX_YEAR delimit the range for valid years
* when either inserting data or performing date arithmetic
*/
#define MIN_YEAR 0001
#define MAX_YEAR 9999
#ifdef NETWARE_386
#define sleep(nsec) delay((nsec) * 1000)
#endif
#endif /* _JRD_TIME_H_ */