Merge pull request #78 from livecode/develop-8.1

Merge develop-8.1 into develop

Author: peter-b

libjpeg/libjpeg.gyp

@@ -34,9 +34,7 @@
 							'include/jmorecfg.h',
 							'include/jpeglib.h',
 
-							'src/jchuff.h',
 							'src/jdct.h',
-							'src/jdhuff.h',
 							'src/jinclude.h',
 							'src/jmemsys.h',
 							'src/jpegint.h',

libpcre/libpcre.gyp

@@ -67,6 +67,10 @@
 
 						'direct_dependent_settings':
 						{
+							'defines':
+							[
+								'PCRE_STATIC=1',
+							],
 							'include_dirs':
 							[
 								'include',

libpng/libpng.gyp

@@ -39,9 +39,9 @@
 							'include/pngdebug.h',
 							'include/pnginfo.h',
 							'include/pnglibconf.h',
-							'include/pngpriv.h',
 							'include/pngstruct.h',
 
+							'src/pngpriv.h',
 							'src/png.c',
 							'src/pngerror.c',
 							'src/pngget.c',

libxml/src/relaxng.c

@@ -2088,6 +2088,7 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
                          const xmlChar * arg2)
 {
     char msg[1000];
+	xmlChar *result = NULL;
 
     if (arg1 == NULL)
         arg1 = BAD_CAST "";
@@ -2215,7 +2216,7 @@ xmlRelaxNGGetErrorString(xmlRelaxNGValidErr err, const xmlChar * arg1,
         snprintf(msg, 1000, "Unknown error code %d\n", err);
     }
     msg[1000 - 1] = 0;
-    xmlChar *result = xmlCharStrdup(msg);
+    result = xmlCharStrdup(msg);
     return (xmlEscapeFormatString(&result));
 }
 

libxml/src/xmlschemas.c

@@ -3121,6 +3121,7 @@ xmlSchemaPSimpleTypeErr(xmlSchemaParserCtxtPtr ctxt,
 			const xmlChar *str2)
 {
     xmlChar *msg = NULL;
+	xmlChar *expectedEscaped = NULL;
 
     xmlSchemaFormatNodeForError(&msg, ACTXT_CAST ctxt, node);
     if (message == NULL) {
@@ -3169,7 +3170,7 @@ xmlSchemaPSimpleTypeErr(xmlSchemaParserCtxtPtr ctxt,
 	}
 	if (expected) {
 	    msg = xmlStrcat(msg, BAD_CAST " Expected is '");
-	    xmlChar *expectedEscaped = xmlCharStrdup(expected);
+	    expectedEscaped = xmlCharStrdup(expected);
 	    msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
 	    FREE_AND_NULL(expectedEscaped);
 	    msg = xmlStrcat(msg, BAD_CAST "'.\n");