2013-12-03 09:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* contrib/hbmxml/3rd/minixml/mxml.hbp * updated source package URL * contrib/hbmxml/3rd/minixml/minixml.dif * rediffed with: hbmk2 ../../../../bin/3rdpatch.hb -rediff * src/rtl/gtxwc/gtxwc.c * minor cleanup
2013-12-03 09:03:49 +01:00
parent 93b9b87bad
commit e7021f96ac
4 changed files with 66 additions and 45 deletions
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,17 @@
     * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
 */

+2013-12-03 09:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbmxml/3rd/minixml/mxml.hbp
+    * updated source package URL
+
+  * contrib/hbmxml/3rd/minixml/minixml.dif
+    * rediffed with:
+         hbmk2 ../../../../bin/3rdpatch.hb -rediff
+
+  * src/rtl/gtxwc/gtxwc.c
+    * minor cleanup
+
 2013-11-28 03:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
  * contrib/hbmxml/3rd/minixml/mxml_fil.c
    ! fixed mxmlLoadString() with top node - patch by Franček Prijatelj
--- a/contrib/hbmxml/3rd/minixml/minixml.dif
+++ b/contrib/hbmxml/3rd/minixml/minixml.dif
@@ -1,6 +1,6 @@
-diff -urN minixml.orig\config.h minixml\config.h
--- minixml.orig\config.h	Thu Apr 04 03:37:59 2013
-+++ minixml\config.h	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/config.h minixml/config.h
+--- minixml.orig/config.h	2013-11-28 11:32:46.008002028 +0100
+++ minixml/config.h	2013-11-28 11:32:46.008002028 +0100
@@ -18,62 +18,89 @@
  * Include necessary headers...
  */
@@ -127,31 +127,9 @@ diff -urN minixml.orig\config.h minixml\config.h
 +#  ifdef __cplusplus
 +}
 +#  endif /* __cplusplus */
-diff -urN minixml.orig\mxml.h minixml\mxml.h
--- minixml.orig\mxml.h	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml.h	Thu Apr 04 03:37:59 2013
-@@ -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...
-diff -urN minixml.orig\mxml_fil.c minixml\mxml_fil.c
--- minixml.orig\mxml_fil.c	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml_fil.c	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/mxml_fil.c minixml/mxml_fil.c
+--- minixml.orig/mxml_fil.c	2013-11-28 11:32:46.012002028 +0100
+++ minixml/mxml_fil.c	2013-11-28 11:32:46.012002028 +0100
@@ -329,8 +329,14 @@
     return (-1);
 
@@ -204,6 +182,15 @@ diff -urN minixml.orig\mxml_fil.c minixml\mxml_fil.c
     if (errno != EAGAIN)
 #endif /* EINTR */
       return (-1);
+@@ -2074,7 +2091,7 @@
+   {
+     node = parent;
+ 
+-    while (parent->parent != top && parent->parent)
+    while (parent != top && parent->parent)
+       parent = parent->parent;
+ 
+     if (node != parent)
@@ -2786,6 +2803,10 @@
 
 	  if (global->wrap > 0 && (col + width) > global->wrap)
@@ -248,9 +235,31 @@ diff -urN minixml.orig\mxml_fil.c minixml\mxml_fil.c
 	    if ((*putc_cb)('\n', p) < 0)
 	      return (-1);
 
-diff -urN minixml.orig\mxml_nod.c minixml\mxml_nod.c
--- minixml.orig\mxml_nod.c	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml_nod.c	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/mxml.h minixml/mxml.h
+--- minixml.orig/mxml.h	2013-11-28 11:32:46.016002026 +0100
+++ minixml/mxml.h	2013-11-28 11:32:46.020002025 +0100
+@@ -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...
+diff -urN minixml.orig/mxml_nod.c minixml/mxml_nod.c
+--- minixml.orig/mxml_nod.c	2013-11-28 11:32:46.012002028 +0100
+++ minixml/mxml_nod.c	2013-11-28 11:32:46.016002026 +0100
@@ -221,7 +221,11 @@
   */
 
@@ -264,9 +273,9 @@ diff -urN minixml.orig\mxml_nod.c minixml\mxml_nod.c
 
  /*
   * Now delete any node data...
-diff -urN minixml.orig\mxml_pri.c minixml\mxml_pri.c
--- minixml.orig\mxml_pri.c	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml_pri.c	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/mxml_pri.c minixml/mxml_pri.c
+--- minixml.orig/mxml_pri.c	2013-11-28 11:32:46.016002026 +0100
+++ minixml/mxml_pri.c	2013-11-28 11:32:46.016002026 +0100
@@ -1,5 +1,5 @@
 /*
 - * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $"
@@ -281,9 +290,9 @@ diff -urN minixml.orig\mxml_pri.c minixml\mxml_pri.c
 - * End of "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $".
 + * End of "$Id: mxml_pri.c 422 2010-11-07 22:55:11Z mike $".
  */
-diff -urN minixml.orig\mxml_pri.h minixml\mxml_pri.h
--- minixml.orig\mxml_pri.h	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml_pri.h	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/mxml_pri.h minixml/mxml_pri.h
+--- minixml.orig/mxml_pri.h	2013-11-28 11:32:46.016002026 +0100
+++ minixml/mxml_pri.h	2013-11-28 11:32:46.016002026 +0100
@@ -1,5 +1,5 @@
 /*
 - * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $"
@@ -298,9 +307,9 @@ diff -urN minixml.orig\mxml_pri.h minixml\mxml_pri.h
 - * End of "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $".
 + * End of "$Id: mxml_pri.h 408 2010-09-19 05:26:46Z mike $".
  */
-diff -urN minixml.orig\mxml_set.c minixml\mxml_set.c
--- minixml.orig\mxml_set.c	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml_set.c	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/mxml_set.c minixml/mxml_set.c
+--- minixml.orig/mxml_set.c	2013-11-28 11:32:46.016002026 +0100
+++ minixml/mxml_set.c	2013-11-28 11:32:46.016002026 +0100
@@ -1,5 +1,5 @@
 /*
 - * "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $"
@@ -457,9 +466,9 @@ diff -urN minixml.orig\mxml_set.c minixml\mxml_set.c
 - * End of "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $".
 + * End of "$Id: mxml-set.c 426 2011-01-01 23:42:17Z mike $".
  */
-diff -urN minixml.orig\mxml_str.c minixml\mxml_str.c
--- minixml.orig\mxml_str.c	Thu Apr 04 03:37:59 2013
-+++ minixml\mxml_str.c	Thu Apr 04 03:37:59 2013
+diff -urN minixml.orig/mxml_str.c minixml/mxml_str.c
+--- minixml.orig/mxml_str.c	2013-11-28 11:32:46.016002026 +0100
+++ minixml/mxml_str.c	2013-11-28 11:32:46.016002026 +0100
@@ -28,6 +28,9 @@
 
 #include "config.h"
--- a/contrib/hbmxml/3rd/minixml/mxml.hbp
+++ b/contrib/hbmxml/3rd/minixml/mxml.hbp
@@ -31,7 +31,7 @@ mxml_str.c

 # ORIGIN http://www.minixml.org
 # VER    2.7
-# URL    http://ftp.easysw.com/pub/mxml/2.7/mxml-2.7.tar.gz
+# URL    https://www.msweet.org/files/project3/mxml-2.7.tar.gz
 # DIFF   minixml.dif
 #
 # MAP    COPYING
--- a/src/rtl/gtxwc/gtxwc.c
+++ b/src/rtl/gtxwc/gtxwc.c
@@ -4897,7 +4897,8 @@ static HB_BOOL hb_gt_xwc_SetMode( PHB_GT pGT, int iRow, int iCol )
               fResult = HB_TRUE;
            else if( hb_dateMilliSeconds() > nTimeOut )
               break;
-            hb_releaseCPU();
+            else
+               hb_releaseCPU();
         }
         while( !fResult );