diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 64f3abc8c2..4e12f55b5e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2005-10-24 12:08 UTC+0100 Viktor Szakats (viktor.szakats/syenar.hu) + + * hrbdll.bc + * hrbdll.vc + * makefile.bc + * makefile.nt + * makefile.vc + * makefile64.nt + * source/codepage/Makefile + * source/codepage/cdphu852.c + + source/codepage/cdphuiso.c + * source/codepage/cdphuwin.c + * source/lang/Makefile + * source/lang/msghu852.c + * source/lang/msghucwi.c + + source/lang/msghuiso.c + * source/lang/msghuwin.c + * HU lang stuff updated. ISO cp added (same as Win cp). Minor fixes + (not related to functionality) added. + 2005-10-24 02:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/dot/pp.prg * harbour/contrib/dot/pp_harb.ch diff --git a/harbour/hrbdll.bc b/harbour/hrbdll.bc index b5a6de4742..64a5e3deec 100644 --- a/harbour/hrbdll.bc +++ b/harbour/hrbdll.bc @@ -358,6 +358,7 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\msghriso.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ + $(OBJ_DIR)\msghuiso.obj \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgid.obj \ $(OBJ_DIR)\msgis850.obj \ @@ -399,6 +400,7 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdphu852.obj \ + $(OBJ_DIR)\cdphuiso.obj \ $(OBJ_DIR)\cdphuwin.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ @@ -808,6 +810,7 @@ $(HARBOUR_DLL) : \ echo. $(OBJ_DIR)\msghriso.obj + >> hdll.tmp echo. $(OBJ_DIR)\msghu852.obj + >> hdll.tmp echo. $(OBJ_DIR)\msghucwi.obj + >> hdll.tmp + echo. $(OBJ_DIR)\msghuiso.obj + >> hdll.tmp echo. $(OBJ_DIR)\msghuwin.obj + >> hdll.tmp echo. $(OBJ_DIR)\msgid.obj + >> hdll.tmp echo. $(OBJ_DIR)\msgis850.obj + >> hdll.tmp @@ -1955,6 +1958,9 @@ $(OBJ_DIR)\msghu852.obj : $(LANG_DIR)\msghu852.c $(OBJ_DIR)\msghucwi.obj : $(LANG_DIR)\msghucwi.c $(CC) $(CLIBFLAGS) -o$@ $** +$(OBJ_DIR)\msghuiso.obj : $(LANG_DIR)\msghuiso.c + $(CC) $(CLIBFLAGS) -o$@ $** + $(OBJ_DIR)\msghuwin.obj : $(LANG_DIR)\msghuwin.c $(CC) $(CLIBFLAGS) -o$@ $** @@ -2191,6 +2197,9 @@ $(OBJ_DIR)\cdpgewin.obj : $(CODEPAGE_DIR)\cdpgewin.c $(OBJ_DIR)\cdphu852.obj : $(CODEPAGE_DIR)\cdphu852.c $(CC) $(CLIBFLAGS) -o$@ $** +$(OBJ_DIR)\cdphuiso.obj : $(CODEPAGE_DIR)\cdphuiso.c + $(CC) $(CLIBFLAGS) -o$@ $** + $(OBJ_DIR)\cdphuwin.obj : $(CODEPAGE_DIR)\cdphuwin.c $(CC) $(CLIBFLAGS) -o$@ $** diff --git a/harbour/hrbdll.vc b/harbour/hrbdll.vc index 9cf11e28d1..3d187ea092 100644 --- a/harbour/hrbdll.vc +++ b/harbour/hrbdll.vc @@ -339,6 +339,7 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\msghriso.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ + $(OBJ_DIR)\msghuiso.obj \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgid.obj \ $(OBJ_DIR)\msgis850.obj \ @@ -385,6 +386,7 @@ HARBOUR_DLL_OBJS = \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdphu852.obj \ + $(OBJ_DIR)\cdphuiso.obj \ $(OBJ_DIR)\cdphuwin.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ @@ -1585,6 +1587,9 @@ $(OBJ_DIR)\msghu852.obj : $(LANG_DIR)\msghu852.c $(OBJ_DIR)\msghucwi.obj : $(LANG_DIR)\msghucwi.c $(CC) $(CLIBFLAGS) /Fo$@ $** +$(OBJ_DIR)\msghuiso.obj : $(LANG_DIR)\msghuiso.c + $(CC) $(CLIBFLAGS) /Fo$@ $** + $(OBJ_DIR)\msghuwin.obj : $(LANG_DIR)\msghuwin.c $(CC) $(CLIBFLAGS) /Fo$@ $** @@ -1791,6 +1796,9 @@ $(OBJ_DIR)\cdpgewin.obj : $(CODEPAGE_DIR)\cdpgewin.c $(OBJ_DIR)\cdphu852.obj : $(CODEPAGE_DIR)\cdphu852.c $(CC) $(CLIBFLAGS) -o$@ $** +$(OBJ_DIR)\cdphuiso.obj : $(CODEPAGE_DIR)\cdphuiso.c + $(CC) $(CLIBFLAGS) -o$@ $** + $(OBJ_DIR)\cdphuwin.obj : $(CODEPAGE_DIR)\cdphuwin.c $(CC) $(CLIBFLAGS) -o$@ $** diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 956ba9877c..b053e2adc6 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -426,6 +426,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msghriso.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ + $(OBJ_DIR)\msghuiso.obj \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgid.obj \ $(OBJ_DIR)\msgis850.obj \ @@ -459,6 +460,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdphu852.obj \ + $(OBJ_DIR)\cdphuiso.obj \ $(OBJ_DIR)\cdphuwin.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ @@ -2289,6 +2291,10 @@ $(OBJ_DIR)\msghucwi.obj : $(LANG_DIR)\msghucwi.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msghuiso.obj : $(LANG_DIR)\msghuiso.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\msghuwin.obj : $(LANG_DIR)\msghuwin.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, @@ -2416,6 +2422,10 @@ $(OBJ_DIR)\cdphu852.obj : $(CODEPAGE_DIR)\cdphu852.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\cdphuiso.obj : $(CODEPAGE_DIR)\cdphuiso.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\cdphuwin.obj : $(CODEPAGE_DIR)\cdphuwin.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, diff --git a/harbour/makefile.nt b/harbour/makefile.nt index ec22930e43..4fdc58db9b 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -474,6 +474,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msghriso.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ + $(OBJ_DIR)\msghuiso.obj \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgid.obj \ $(OBJ_DIR)\msgis850.obj \ @@ -514,6 +515,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdphu852.obj \ + $(OBJ_DIR)\cdphuiso.obj \ $(OBJ_DIR)\cdphuwin.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 8abaced94d..aa0f784f47 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -438,6 +438,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msghriso.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ + $(OBJ_DIR)\msghuiso.obj \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgid.obj \ $(OBJ_DIR)\msgis850.obj \ @@ -478,6 +479,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdphu852.obj \ + $(OBJ_DIR)\cdphuiso.obj \ $(OBJ_DIR)\cdphuwin.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ diff --git a/harbour/makefile64.nt b/harbour/makefile64.nt index c3d04c510b..2fc8369d8a 100644 --- a/harbour/makefile64.nt +++ b/harbour/makefile64.nt @@ -474,6 +474,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msghriso.obj \ $(OBJ_DIR)\msghu852.obj \ $(OBJ_DIR)\msghucwi.obj \ + $(OBJ_DIR)\msghuiso.obj \ $(OBJ_DIR)\msghuwin.obj \ $(OBJ_DIR)\msgid.obj \ $(OBJ_DIR)\msgis850.obj \ @@ -514,6 +515,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdphu852.obj \ + $(OBJ_DIR)\cdphuiso.obj \ $(OBJ_DIR)\cdphuwin.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 9c169ed72d..11e4cedb6c 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -13,6 +13,7 @@ C_SOURCES=\ cdpgedos.c \ cdpgewin.c \ cdphu852.c \ + cdphuiso.c \ cdphuwin.c \ cdppl852.c \ cdppliso.c \ diff --git a/harbour/source/codepage/cdphu852.c b/harbour/source/codepage/cdphu852.c index 0f6341ab52..5d537a7d41 100644 --- a/harbour/source/codepage/cdphu852.c +++ b/harbour/source/codepage/cdphu852.c @@ -6,7 +6,7 @@ * Harbour Project source code: * National Collation Support Module (HU852) * - * Copyright 1999-2004 Viktor Szakats + * Copyright 1999-2005 Viktor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,9 +50,9 @@ * */ -/* Language name: */ -/* ISO language code (2 chars): (please look it up in /doc/lang_id.txt) */ -/* Codepage: */ +/* Language name: Hungarian */ +/* ISO language code (2 chars): HU */ +/* Codepage: IBM-852 */ #include #include "hbapi.h" @@ -84,7 +84,7 @@ */ /* NOTE: Ž/„ has been added to make it more compatible with sixhu852 for C52 - and [vszakats] */ + [vszakats] */ static HB_CODEPAGE s_codepage = { "HU852", CPID_852, UNITB_852, NUMBER_OF_CHARACTERS, @@ -94,7 +94,15 @@ static HB_CODEPAGE s_codepage = { "HU852", HB_CODEPAGE_INIT( HU852 ); -#if ! defined(__GNUC__) && ! defined(_MSC_VER) +#if defined(HB_PRAGMA_STARTUP) #pragma startup hb_codepage_Init_HU852 +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_codepage_Init_HU852 = hb_codepage_Init_HU852; + #pragma data_seg() #endif - diff --git a/harbour/source/codepage/cdphuwin.c b/harbour/source/codepage/cdphuwin.c index 8eb1a93b5c..2b7976e60b 100644 --- a/harbour/source/codepage/cdphuwin.c +++ b/harbour/source/codepage/cdphuwin.c @@ -6,7 +6,7 @@ * Harbour Project source code: * National Collation Support Module (HUWIN) * - * Copyright 1999-2004 Viktor Szakats + * Copyright 1999-2005 Viktor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,9 +50,9 @@ * */ -/* Language name: */ +/* Language name: Hungarian */ /* ISO language code (2 chars): HU */ -/* Codepage: 1250 */ +/* Codepage: Windows-1250 */ #include #include "hbapi.h" @@ -91,7 +91,15 @@ static HB_CODEPAGE s_codepage = { "HUWIN", HB_CODEPAGE_INIT( HUWIN ); -#if ! defined(__GNUC__) && ! defined(_MSC_VER) +#if defined(HB_PRAGMA_STARTUP) #pragma startup hb_codepage_Init_HUWIN +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_codepage_Init_HUWIN = hb_codepage_Init_HUWIN; + #pragma data_seg() #endif - diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile index 4336e118b4..10a29d2853 100644 --- a/harbour/source/lang/Makefile +++ b/harbour/source/lang/Makefile @@ -27,6 +27,7 @@ C_SOURCES=\ msghriso.c \ msghu852.c \ msghucwi.c \ + msghuiso.c \ msghuwin.c \ msgid.c \ msgis850.c \ diff --git a/harbour/source/lang/msghu852.c b/harbour/source/lang/msghu852.c index dcdf3742bc..253596ee87 100644 --- a/harbour/source/lang/msghu852.c +++ b/harbour/source/lang/msghu852.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Language Support Module (HU852) * - * Copyright 1999-2001 Viktor Szakats + * Copyright 1999-2005 Viktor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ /* Language name: Hungarian */ /* ISO language code (2 chars): HU */ -/* Codepage: 852 */ +/* Codepage: IBM-852 */ #include "hbapilng.h" @@ -65,7 +65,7 @@ static HB_LANG s_lang = "Hungarian", /* Name (in English) */ "Magyar", /* Name (in native language) */ "HU", /* RFC ID */ - "852", /* Codepage */ + "IBM-852", /* Codepage */ "$Revision$ $Date$", /* Version */ /* Month names */ @@ -205,7 +205,16 @@ HB_LANG_ANNOUNCE( HU852 ); HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HU852 ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_HU852 ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup hb_lang_Init_HU852 -#endif +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_lang_Init_HU852 +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_lang_Init_HU852 = hb_lang_Init_HU852; + #pragma data_seg() +#endif diff --git a/harbour/source/lang/msghucwi.c b/harbour/source/lang/msghucwi.c index 719965e819..aa2ff55c87 100644 --- a/harbour/source/lang/msghucwi.c +++ b/harbour/source/lang/msghucwi.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Language Support Module (HUCWI) * - * Copyright 1999-2001 Viktor Szakats + * Copyright 1999-2005 Viktor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -205,7 +205,16 @@ HB_LANG_ANNOUNCE( HUCWI ); HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HUCWI ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_HUCWI ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup hb_lang_Init_HUCWI -#endif +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_lang_Init_HUCWI +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_lang_Init_HUCWI = hb_lang_Init_HUCWI; + #pragma data_seg() +#endif diff --git a/harbour/source/lang/msghuwin.c b/harbour/source/lang/msghuwin.c index ec4bb62c26..495aa8d26a 100644 --- a/harbour/source/lang/msghuwin.c +++ b/harbour/source/lang/msghuwin.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Language Support Module (HUWIN) * - * Copyright 1999-2001 Viktor Szakats + * Copyright 1999-2005 Viktor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ /* Language name: Hungarian */ /* ISO language code (2 chars): HU */ -/* Codepage: Windows-1 */ +/* Codepage: Windows-1250 */ #include "hbapilng.h" @@ -65,7 +65,7 @@ static HB_LANG s_lang = "Hungarian", /* Name (in English) */ "Magyar", /* Name (in native language) */ "HU", /* RFC ID */ - "Windows-1", /* Codepage */ + "Windows-1250", /* Codepage */ "$Revision$ $Date$", /* Version */ /* Month names */ @@ -205,7 +205,16 @@ HB_LANG_ANNOUNCE( HUWIN ); HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HUWIN ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_HUWIN ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup hb_lang_Init_HUWIN -#endif +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_lang_Init_HUWIN +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_lang_Init_HUWIN = hb_lang_Init_HUWIN; + #pragma data_seg() +#endif