From 4237258e51021bf8a05fa015a3055f00551ec4c1 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Wed, 20 Oct 1999 23:28:17 +0000 Subject: [PATCH] See ChangeLog entry 19991020-19:15 EDT David G. Holm --- harbour/ChangeLog | 11 ++++++++ harbour/include/hbwinapi.h | 50 ++++++++++++++++++++++++++++++++++++ harbour/include/wincheck.h | 13 ---------- harbour/source/rtl/dates.c | 4 +-- harbour/source/rtl/dir.c | 4 +-- harbour/source/rtl/environ.c | 4 +-- harbour/source/rtl/inkey.c | 4 +-- 7 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 harbour/include/hbwinapi.h delete mode 100644 harbour/include/wincheck.h diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8444113976..23893bce94 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +19991020-19:15 EDT David G. Holm + + + include/hbwinapi.h + - include/wincheck.h + * source/rtl/dates.c + * source/rtl/dir.c + * source/rtl/environ.c + * source/rtl/inkey.c + % Changed name of wincheck.h to hbwinapi.h (and added missing + CVS ID, Copyright and free software header, and self-check). + Wed Oct 20 19:28:51 1999 Gonzalo A. Diethelm * source/Makefile: diff --git a/harbour/include/hbwinapi.h b/harbour/include/hbwinapi.h new file mode 100644 index 0000000000..aa335a5fb8 --- /dev/null +++ b/harbour/include/hbwinapi.h @@ -0,0 +1,50 @@ +/* + * $Id$ + */ +/* + * Harbour Project source code: + * This include file determines whether or not to include the Windows API + * and defines HARBOUR_USE_WIN if the Windows API is included. + * + * Copyright 1999 by David G. Holm, who derived this module from various + * similar #if blocks that used to be locate in several source modules, + * all of which now #include "hbwinapi.h". + * 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 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) 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 HRL + * and/or HVM code into it. + * + * 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 program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ + +#ifndef HB_HBWINAPI_H_ +#define HB_HBWINAPI_H_ + +#if defined(HARBOUR_USE_WIN_GTAPI) || defined(WINNT) + #define HARBOUR_USE_WIN + #define WIN32_LEAN_AND_MEAN + #include + #if defined(__GNUC__) + #define HB_DONT_DEFINE_BASIC_TYPES + #endif +#endif + +#endif diff --git a/harbour/include/wincheck.h b/harbour/include/wincheck.h deleted file mode 100644 index fa2a3fdea8..0000000000 --- a/harbour/include/wincheck.h +++ /dev/null @@ -1,13 +0,0 @@ -/* The purpose for this Harbour include file is to determine if - windows.h should be included and to set set additional manifest - constants should this be the case. When used, this include file - must be the very first include file that is included! */ - -#if defined(_Windows) || defined(WINNT) - #define HARBOUR_USE_WIN - #define WIN32_LEAN_AND_MEAN - #include - #if defined(__GNUC__) - #define HB_DONT_DEFINE_BASIC_TYPES - #endif -#endif diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c index ec056b96d3..599f94d0f7 100644 --- a/harbour/source/rtl/dates.c +++ b/harbour/source/rtl/dates.c @@ -65,9 +65,9 @@ * */ -/* NOTE: The following #include "wincheck.h" must +/* NOTE: The following #include "hbwinapi.h" must be ahead of any other #include statements! */ -#include "wincheck.h" +#include "hbwinapi.h" #include "extend.h" #include "errorapi.h" diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c index bf8025d561..1f7bd97f87 100644 --- a/harbour/source/rtl/dir.c +++ b/harbour/source/rtl/dir.c @@ -107,9 +107,9 @@ #define INCL_DOSERRORS #endif -/* NOTE: The following #include "wincheck.h" must +/* NOTE: The following #include "hbwinapi.h" must be ahead of any other #include statements! */ -#include "wincheck.h" +#include "hbwinapi.h" #include #include "extend.h" diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c index 2a59c08546..fff4810ef8 100644 --- a/harbour/source/rtl/environ.c +++ b/harbour/source/rtl/environ.c @@ -55,9 +55,9 @@ #define INCL_DOSMISC #endif -/* NOTE: The following #include "wincheck.h" must +/* NOTE: The following #include "hbwinapi.h" must be ahead of any other #include statements! */ -#include "wincheck.h" +#include "hbwinapi.h" #if defined(__BORLANDC__) && defined(_Windows) && ! defined(VER_PLATFORM_WIN32_WINDOWS) #define VER_PLATFORM_WIN32_WINDOWS 1 diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 62433207fe..2ef6c9c8b4 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -82,9 +82,9 @@ #define INCL_NOPMAPI #endif -/* NOTE: The following #include "wincheck.h" must +/* NOTE: The following #include "hbwinapi.h" must be ahead of any other #include statements! */ -#include "wincheck.h" +#include "hbwinapi.h" #ifdef HARBOUR_USE_WIN #define INPUT_BUFFER_LEN 128