fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-01-15 12:07 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbapi.h
  * harbour/include/hbwmain.c
  * harbour/src/vm/cmdarg.c
    * moved declaration of hb_winmainArgInit() to header file

  * harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c
  * harbour/contrib/hbmxml/3rd/minixml/mxml.h
    ! fixed to compile with WinCE builds
    ; I cannot regenerate .diff file because
         ../../../../bin/hb3rdpat.hbs -rediff
      generates RT error:
         Error BASE/1123  Argument error: HB_ATOKENS
         Called from HB_ATOKENS(0)
         Called from URL_GETFILENAME(810)
         Called from FETCHANDEXTRACT(673)
         Called from MAIN(412)
      Sorry, probably I'm missing sth what was already discussed
      but I was not able to follow all post on the list in last
      weeks so I would like to ask Viktor or Tamas for the help.
This commit is contained in:
Przemyslaw Czerpak
2011-01-15 11:08:03 +00:00
parent f211a162b1
commit 82df9ab45a
6 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -16,6 +16,27 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-15 12:07 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbapi.h
* harbour/include/hbwmain.c
* harbour/src/vm/cmdarg.c
* moved declaration of hb_winmainArgInit() to header file
* harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c
* harbour/contrib/hbmxml/3rd/minixml/mxml.h
! fixed to compile with WinCE builds
; I cannot regenerate .diff file because
../../../../bin/hb3rdpat.hbs -rediff
generates RT error:
Error BASE/1123 Argument error: HB_ATOKENS
Called from HB_ATOKENS(0)
Called from URL_GETFILENAME(810)
Called from FETCHANDEXTRACT(673)
Called from MAIN(412)
Sorry, probably I'm missing sth what was already discussed
but I was not able to follow all post on the list in last
weeks so I would like to ask Viktor or Tamas for the help.
2011-01-15 10:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbwmain.c
* src/vm/cmdarg.c

12
harbour/contrib/hbmxml/3rd/minixml/mxml.h
View File

@@ -29,8 +29,16 @@
# include <stdlib.h>
# include <string.h>
# include <ctype.h>
# include <errno.h>
# if defined( UNDER_CE ) || defined( __CEGCC__ ) || defined( __MINGW32CE__ ) || \
defined( _WINCE )
# include <io.h>
# if !defined( UNDER_CE )
# define UNDER_CE
# endif
# define strerror(e) ""
# else
# include <errno.h>
# endif
/*
* Constants...

2
harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c
View File

@@ -1056,7 +1056,7 @@ mxml_fd_read(_mxml_fdbuf_t *buf) /* I - File descriptor buffer */
while ((bytes = read(buf->fd, buf->buffer, sizeof(buf->buffer))) < 0)
#ifdef EINTR
if (errno != EAGAIN && errno != EINTR)
#else
#elif defined( EAGAIN )
if (errno != EAGAIN)
#endif /* EINTR */
return (-1);

1
harbour/include/hbapi.h
View File

@@ -1029,6 +1029,7 @@ extern char * hb_cmdargString( const char * pszName ); /* Retur
extern int hb_cmdargNum( const char * pszName ); /* Returns the numeric value of an internal switch (like //F:90) */
extern HB_U32 hb_cmdargProcessVM( int * pCancelKey, int * pCancelKeyEx ); /* Check for command line internal arguments */
#if defined( HB_OS_WIN )
extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
extern HB_EXPORT HB_BOOL hb_winmainArgGet( void * phInstance, void * phPrevInstance, int * piCmdShow ); /* Retrieve WinMain() parameters */
#endif

6
harbour/include/hbwmain.c
View File

@@ -63,12 +63,6 @@ static char * s_argv[ HB_MAX_ARGS ];
# define HB_LPSTR LPSTR
#endif
#if defined( HB_VM_STARTUP )
HB_EXTERN_BEGIN
extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
HB_EXTERN_END
#endif
int WINAPI WinMain( HINSTANCE hInstance, /* handle to current instance */
HINSTANCE hPrevInstance, /* handle to previous instance */
HB_LPSTR lpCmdLine, /* pointer to command line */

4
harbour/src/vm/cmdarg.c
View File

@@ -88,10 +88,6 @@ static HANDLE s_hPrevInstance = 0;
static int s_iCmdShow = 0;
static HB_BOOL s_WinMainParam = HB_FALSE;
HB_EXTERN_BEGIN
extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
HB_EXTERN_END
void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow )
{
s_hInstance = hInstance;