diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4581258130..4203a4150c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-07 00:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * include/Makefile + - include/hbfixdj.h + * include/hbsetup.h + - Removed file no longer needed. Harbour no longer uses + is*()/toupper()/tolower() calls, or . + + * source/rtl/gtpca/gtpca.c + % Removed #include . + 2009-02-07 00:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbdefs.h * harbour/include/hbapi.h @@ -355,7 +365,7 @@ functions. ; TODO: Remove DJGPP to*() hack. (or should we keep it to - support foreign code, like hbpcre and hbzlib?) + support foreign code, like hbpcre and hbzlib?) [DONE] ; TODO: Replace HB_PP_UPPER(), HB_PP_ISDIGIT() with equivalent new macros. [CANCELLED] ; TODO: Remove remaining #include lines. [DONE] diff --git a/harbour/include/Makefile b/harbour/include/Makefile index d8ef28f3b9..2dbe4871e7 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -29,7 +29,6 @@ C_HEADERS=\ hbdefs.h \ hberrors.h \ hbexprop.h \ - hbfixdj.h \ hbgtcore.h \ hbhash.h \ hbinit.h \ diff --git a/harbour/include/hbfixdj.h b/harbour/include/hbfixdj.h deleted file mode 100644 index d3890d9836..0000000000 --- a/harbour/include/hbfixdj.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Header file for compiler and runtime basic type declarations - * - * Copyright 1999 {list of individual authors and e-mail addresses} - * 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. - * - */ - -#ifdef __dj_include_inline_ctype_ha_ - -#undef isalnum -#undef isalpha -#undef iscntrl -#undef isdigit -#undef isgraph -#undef islower -#undef isprint -#undef ispunct -#undef isspace -#undef isupper -#undef isxdigit - -#undef tolower -#undef toupper - -#define isalnum(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISALNUM) -#define isalpha(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISALPHA) -#define iscntrl(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISCNTRL) -#define isdigit(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISDIGIT) -#define isgraph(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISGRAPH) -#define islower(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISLOWER) -#define isprint(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISPRINT) -#define ispunct(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISPUNCT) -#define isspace(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISSPACE) -#define isupper(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISUPPER) -#define isxdigit(c) (__dj_ctype_flags[(unsigned char)(c)+1] & __dj_ISXDIGIT) - -#define tolower(c) (__dj_ctype_tolower[(unsigned char)(c)+1]) -#define toupper(c) (__dj_ctype_toupper[(unsigned char)(c)+1]) - -#endif /* __dj_include_inline_ctype_ha_ */ diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index aebc891d8f..7fb308360c 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -381,15 +381,6 @@ * hbmath.h - math errors handling */ -/* *********************************************************************** - * some fixes in compiler header files - */ - -#if defined( __DJGPP__ ) - /* Fix DJGPP in call to: toupper(), tolower(), is...() */ - #include "hbfixdj.h" -#endif - /* *********************************************************************** * Extern "C" detection */ diff --git a/harbour/source/rtl/gtpca/gtpca.c b/harbour/source/rtl/gtpca/gtpca.c index 2f0bf5d5dc..144df6e705 100644 --- a/harbour/source/rtl/gtpca/gtpca.c +++ b/harbour/source/rtl/gtpca/gtpca.c @@ -68,7 +68,6 @@ #include "hb_io.h" #include "inkey.ch" -#include #include #if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )