diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c55840e625..84267bbdbb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-20 17:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmxml/3rd/minixml/config.h + * -> -std=gnu89. Details in comment. + + * contrib/hbunix/hbunix.hbp + * -> -std=gnu89. + + * contrib/xhb/hbserv.c + * formatting. + + * contrib/hbmxml/tests/testmxml.prg + ! Fix. [Tamas Tevesz] + 2011-04-20 13:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/xhb/xhb.hbp ! Moving to -std=gnu89 for hbserv.c (maybe more) for *nix platforms. diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp index 3d4e444ca3..4a670e5bd5 100644 --- a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp +++ b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp @@ -16,6 +16,11 @@ {win}-cflag=-DWIN32 -DWIN {win|dos|os2}-cflag=-D_EOL_CRLF +# for snprintf()/vsnprintf(). They can be disabled in config.h +# using HAVE_SNPRINTF and HAVE_VSNPRINTF, but then isdigit() +# becomes the missing bit. [vszakats] +-cflag=-std=gnu89{!lngcpp&allgcc} + mxml_att.c mxml_ent.c mxml_fil.c diff --git a/harbour/contrib/hbmxml/tests/testmxml.prg b/harbour/contrib/hbmxml/tests/testmxml.prg index 5bf13e4017..5e3cb95ffa 100644 --- a/harbour/contrib/hbmxml/tests/testmxml.prg +++ b/harbour/contrib/hbmxml/tests/testmxml.prg @@ -5,7 +5,7 @@ /* * Test program for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2011 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -552,8 +552,8 @@ PROCEDURE Main( cFileArg ) QUIT ENDIF - IF s_aSAXEventCounts[ MXML_SAX_DATA ] != 61 - OutErr( hb_strFormat( "MXML_SAX_DATA seen %d times, expected 61 times!", ; + IF s_aSAXEventCounts[ MXML_SAX_DATA ] != 60 + OutErr( hb_strFormat( "MXML_SAX_DATA seen %d times, expected 60 times!", ; s_aSAXEventCounts[ MXML_SAX_DATA ] ) + hb_eol() ) ErrorLevel( 1 ) QUIT diff --git a/harbour/contrib/hbunix/hbunix.hbp b/harbour/contrib/hbunix/hbunix.hbp index c79ddaba3c..3bb11a7353 100644 --- a/harbour/contrib/hbunix/hbunix.hbp +++ b/harbour/contrib/hbunix/hbunix.hbp @@ -11,6 +11,8 @@ -stop{!unix} +-cflag=-std=gnu89{!lngcpp&allgcc} + hbunix.hbx chdir.c diff --git a/harbour/contrib/xhb/hbserv.c b/harbour/contrib/xhb/hbserv.c index 659c17976f..0af0c60d6f 100644 --- a/harbour/contrib/xhb/hbserv.c +++ b/harbour/contrib/xhb/hbserv.c @@ -527,9 +527,9 @@ static LRESULT CALLBACK s_MsgFilterFunc( int nCode, WPARAM wParam, LPARAM lParam switch( msg->message ) { case WM_USER: - case WM_USER+1: - case WM_USER+2: - case WM_USER+3: + case WM_USER + 1: + case WM_USER + 2: + case WM_USER + 3: case WM_QUIT: /* we'll ignore the request here. the application must still receive the message */ @@ -754,7 +754,7 @@ HB_FUNC( HB_STARTSERVICE ) int iCount = hb_threadCountStacks(); if( iCount > 2 || ( sp_hooks == NULL && iCount > 1 ) ) { - /*TODO: Right error code here*/ + /* TODO: Right error code here */ hb_errRT_BASE_SubstR( EG_ARG, 3012, "Service must be started before starting threads", NULL, 0); return; } @@ -952,7 +952,7 @@ HB_FUNC( HB_SIGNALDESC ) case SEGV_MAPERR: hb_retc_const( "Segmentation fault: address not mapped to object"); return; case SEGV_ACCERR: hb_retc_const( "Segmentation fault: invalid permissions for mapped object"); return; #endif - default: hb_retc_const("Segmentation fault"); return; + default: hb_retc_const( "Segmentation fault" ); return; } case SIGILL: switch( iSubSig ) @@ -1030,58 +1030,58 @@ HB_FUNC( HB_SIGNALDESC ) switch( iSubSig ) { case EXCEPTION_ACCESS_VIOLATION: - hb_retc_const("Memory read/write access violation"); return; + hb_retc_const( "Memory read/write access violation" ); return; case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: - hb_retc_const("Array out of bounds" ); return; + hb_retc_const( "Array out of bounds" ); return; case EXCEPTION_DATATYPE_MISALIGNMENT: - hb_retc_const("Data misaligned" ); return; + hb_retc_const( "Data misaligned" ); return; case EXCEPTION_FLT_DENORMAL_OPERAND: - hb_retc_const("Denormal operand in Floating-point operation"); return; + hb_retc_const( "Denormal operand in Floating-point operation" ); return; case EXCEPTION_FLT_DIVIDE_BY_ZERO: - hb_retc_const("Floating-point division by zero"); return; + hb_retc_const( "Floating-point division by zero" ); return; case EXCEPTION_FLT_INEXACT_RESULT: - hb_retc_const("Inexact floating-point operation result"); return; + hb_retc_const( "Inexact floating-point operation result" ); return; case EXCEPTION_FLT_INVALID_OPERATION: - hb_retc_const("Invalid floating-point operation"); return; + hb_retc_const( "Invalid floating-point operation" ); return; case EXCEPTION_FLT_OVERFLOW: - hb_retc_const("Floating-point numeric overflow"); return; + hb_retc_const( "Floating-point numeric overflow" ); return; case EXCEPTION_FLT_STACK_CHECK: - hb_retc_const("Floating-point out of stack"); return; + hb_retc_const( "Floating-point out of stack" ); return; case EXCEPTION_FLT_UNDERFLOW: - hb_retc_const("Floating-point numeric underflow"); return; + hb_retc_const( "Floating-point numeric underflow" ); return; case EXCEPTION_ILLEGAL_INSTRUCTION: - hb_retc_const("Illegal instruction"); return; + hb_retc_const( "Illegal instruction" ); return; case EXCEPTION_IN_PAGE_ERROR: - hb_retc_const("Paging error"); return; + hb_retc_const( "Paging error" ); return; case EXCEPTION_INT_DIVIDE_BY_ZERO: - hb_retc_const("Integer division by zero"); return; + hb_retc_const( "Integer division by zero" ); return; case EXCEPTION_INT_OVERFLOW: - hb_retc_const("Integer numeric overflow"); return; + hb_retc_const( "Integer numeric overflow" ); return; case EXCEPTION_PRIV_INSTRUCTION: - hb_retc_const("Illegal instruction for current machine mode"); return; + hb_retc_const( "Illegal instruction for current machine mode" ); return; case EXCEPTION_STACK_OVERFLOW: - hb_retc_const("Stack overflow"); return; + hb_retc_const( "Stack overflow" ); return; } } #endif - hb_retc_const("Unrecognized signal"); + hb_retc_const( "Unrecognized signal" ); }