1diff -ur misc/raptor2-2.0.15/src/raptor_config.h.in misc/build/raptor2-2.0.15/src/raptor_config.h.in 2--- misc/raptor2-2.0.15/src/raptor_config.h.in 2014-11-01 23:04:51.000000000 -0700 3+++ misc/build/raptor2-2.0.15/src/raptor_config.h.in 2016-08-22 19:14:14.557872000 -0700 4@@ -1,317 +1,318 @@ 5+/* src/raptor_config.h. Generated from raptor_config.h.in by configure. */ 6 /* src/raptor_config.h.in. Generated from configure.ac by autoheader. */ 7 8 /* Define if building universal (internal helper macro) */ 9-#undef AC_APPLE_UNIVERSAL_BUILD 10+/* #undef AC_APPLE_UNIVERSAL_BUILD */ 11 12 /* have to check C99 vsnprintf at runtime because cross compiling */ 13-#undef CHECK_VSNPRINTF_RUNTIME 14+/* #undef CHECK_VSNPRINTF_RUNTIME */ 15 16 /* Flex version as a decimal */ 17-#undef FLEX_VERSION_DECIMAL 18+#define FLEX_VERSION_DECIMAL 00000 19 20 /* vsnprintf has C99 compatible return value */ 21-#undef HAVE_C99_VSNPRINTF 22+/* #undef HAVE_C99_VSNPRINTF */ 23 24 /* Have curl/curl.h */ 25-#undef HAVE_CURL_CURL_H 26+/* #undef HAVE_CURL_CURL_H */ 27 28 /* Define to 1 if you have the <dlfcn.h> header file. */ 29-#undef HAVE_DLFCN_H 30+/* #undef HAVE_DLFCN_H 1 */ 31 32 /* Define to 1 if you have the <errno.h> header file. */ 33-#undef HAVE_ERRNO_H 34+#define HAVE_ERRNO_H 1 35 36 /* Define to 1 if you have the <fcntl.h> header file. */ 37-#undef HAVE_FCNTL_H 38+#define HAVE_FCNTL_H 1 39 40 /* Define to 1 if you have the <fetch.h> header file. */ 41-#undef HAVE_FETCH_H 42+/* #undef HAVE_FETCH_H */ 43 44 /* Define to 1 if you have the `getopt' function. */ 45-#undef HAVE_GETOPT 46+#define HAVE_GETOPT 1 47 48 /* Define to 1 if you have the <getopt.h> header file. */ 49-#undef HAVE_GETOPT_H 50+#define HAVE_GETOPT_H 1 51 52 /* Define to 1 if you have the `getopt_long' function. */ 53-#undef HAVE_GETOPT_LONG 54+#define HAVE_GETOPT_LONG 1 55 56 /* Define to 1 if you have the `gettimeofday' function. */ 57-#undef HAVE_GETTIMEOFDAY 58+/* #undef HAVE_GETTIMEOFDAY */ 59 60 /* INN parsedate function present */ 61-#undef HAVE_INN_PARSEDATE 62+/* #undef HAVE_INN_PARSEDATE */ 63 64 /* Define to 1 if you have the <inttypes.h> header file. */ 65-#undef HAVE_INTTYPES_H 66+#define HAVE_INTTYPES_H 1 67 68 /* Define to 1 if you have the `isascii' function. */ 69-#undef HAVE_ISASCII 70+#define HAVE_ISASCII 1 71 72 /* Define to 1 if you have the <libxml/hash.h> header file. */ 73-#undef HAVE_LIBXML_HASH_H 74+#define HAVE_LIBXML_HASH_H 1 75 76 /* Define to 1 if you have the <libxml/HTMLparser.h> header file. */ 77-#undef HAVE_LIBXML_HTMLPARSER_H 78+#define HAVE_LIBXML_HTMLPARSER_H 1 79 80 /* Define to 1 if you have the <libxml/nanohttp.h> header file. */ 81-#undef HAVE_LIBXML_NANOHTTP_H 82+#define HAVE_LIBXML_NANOHTTP_H 1 83 84 /* Define to 1 if you have the <libxml/parser.h> header file. */ 85-#undef HAVE_LIBXML_PARSER_H 86+#define HAVE_LIBXML_PARSER_H 1 87 88 /* Define to 1 if you have the <libxml/SAX2.h> header file. */ 89-#undef HAVE_LIBXML_SAX2_H 90+#define HAVE_LIBXML_SAX2_H 1 91 92 /* Define to 1 if you have the <libxslt/xslt.h> header file. */ 93-#undef HAVE_LIBXSLT_XSLT_H 94+#define HAVE_LIBXSLT_XSLT_H 1 95 96 /* Define to 1 if you have the <limits.h> header file. */ 97-#undef HAVE_LIMITS_H 98+#define HAVE_LIMITS_H 1 99 100 /* Define to 1 if you have the <math.h> header file. */ 101-#undef HAVE_MATH_H 102+#define HAVE_MATH_H 1 103 104 /* Define to 1 if you have the <memory.h> header file. */ 105-#undef HAVE_MEMORY_H 106+#define HAVE_MEMORY_H 1 107 108 /* Define to 1 if you have the `qsort_r' function. */ 109-#undef HAVE_QSORT_R 110+/* #undef HAVE_QSORT_R */ 111 112 /* Define to 1 if you have the `qsort_s' function. */ 113-#undef HAVE_QSORT_S 114+/* #undef HAVE_QSORT_S */ 115 116 /* Raptor raptor_parse_date available */ 117-#undef HAVE_RAPTOR_PARSE_DATE 118+#define HAVE_RAPTOR_PARSE_DATE 1 119 120 /* Define to 1 if you have the `setjmp' function. */ 121-#undef HAVE_SETJMP 122+#define HAVE_SETJMP 1 123 124 /* Define to 1 if you have the <setjmp.h> header file. */ 125-#undef HAVE_SETJMP_H 126+#define HAVE_SETJMP_H 1 127 128 /* Define to 1 if you have the `stat' function. */ 129-#undef HAVE_STAT 130+#define HAVE_STAT 1 131 132 /* Define to 1 if you have the <stddef.h> header file. */ 133-#undef HAVE_STDDEF_H 134+#define HAVE_STDDEF_H 1 135 136 /* Define to 1 if you have the <stdint.h> header file. */ 137-#undef HAVE_STDINT_H 138+/* #undef HAVE_STDINT_H */ 139 140 /* Define to 1 if you have the <stdlib.h> header file. */ 141-#undef HAVE_STDLIB_H 142+#define HAVE_STDLIB_H 1 143 144 /* Define to 1 if you have the `strcasecmp' function. */ 145-#undef HAVE_STRCASECMP 146+/* #undef HAVE_STRCASECMP */ 147 148 /* Define to 1 if you have the `stricmp' function. */ 149-#undef HAVE_STRICMP 150+/* #undef HAVE_STRICMP */ 151 152 /* Define to 1 if you have the <strings.h> header file. */ 153-#undef HAVE_STRINGS_H 154+/* #undef HAVE_STRINGS_H */ 155 156 /* Define to 1 if you have the <string.h> header file. */ 157-#undef HAVE_STRING_H 158+#define HAVE_STRING_H 1 159 160 /* Define to 1 if you have the `strtok_r' function. */ 161-#undef HAVE_STRTOK_R 162+#define HAVE_STRTOK_R 1 163 164 /* Define to 1 if you have the <sys/param.h> header file. */ 165-#undef HAVE_SYS_PARAM_H 166+#define HAVE_SYS_PARAM_H 1 167 168 /* Define to 1 if you have the <sys/stat.h> header file. */ 169-#undef HAVE_SYS_STAT_H 170+#define HAVE_SYS_STAT_H 1 171 172 /* Define to 1 if you have the <sys/time.h> header file. */ 173-#undef HAVE_SYS_TIME_H 174+/* #undef HAVE_SYS_TIME_H */ 175 176 /* Define to 1 if you have the <sys/types.h> header file. */ 177-#undef HAVE_SYS_TYPES_H 178+#define HAVE_SYS_TYPES_H 1 179 180 /* Define to 1 if you have the <unistd.h> header file. */ 181-#undef HAVE_UNISTD_H 182+#define HAVE_UNISTD_H 1 183 184 /* Define to 1 if you have the `vasprintf' function. */ 185-#undef HAVE_VASPRINTF 186+/* #undef HAVE_VASPRINTF */ 187 188 /* Define to 1 if you have the `vsnprintf' function. */ 189-#undef HAVE_VSNPRINTF 190+#define HAVE_VSNPRINTF 1 191 192 /* Define to 1 if you have the `xmlCtxtUseOptions' function. */ 193-#undef HAVE_XMLCTXTUSEOPTIONS 194+#define HAVE_XMLCTXTUSEOPTIONS 1 195 196 /* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ 197-#undef HAVE_XMLSAX2INTERNALSUBSET 198+#define HAVE_XMLSAX2INTERNALSUBSET 1 199 200 /* YAJL has API version 2 */ 201-#undef HAVE_YAJL2 202+/* #undef HAVE_YAJL2 */ 203 204 /* Define to 1 if you have the <yajl/yajl_parse.h> header file. */ 205-#undef HAVE_YAJL_YAJL_PARSE_H 206+/* #undef HAVE_YAJL_YAJL_PARSE_H */ 207 208 /* Is __FUNCTION__ available */ 209-#undef HAVE___FUNCTION__ 210+#define HAVE___FUNCTION__ 1 211 212 /* Define to the sub-directory in which libtool stores uninstalled libraries. 213 */ 214-#undef LT_OBJDIR 215+#define LT_OBJDIR ".libs/" 216 217 /* Define to 1 if maintainer mode is enabled. */ 218-#undef MAINTAINER_MODE 219+/* #undef MAINTAINER_MODE */ 220 221 /* need 'extern int optind' declaration? */ 222-#undef NEED_OPTIND_DECLARATION 223+/* #undef NEED_OPTIND_DECLARATION */ 224 225 /* Define to 1 if your C compiler doesn't accept -c and -o together. */ 226-#undef NO_MINUS_C_MINUS_O 227+/* #undef NO_MINUS_C_MINUS_O */ 228 229 /* Name of package */ 230-#undef PACKAGE 231+#define PACKAGE "raptor2" 232 233 /* Define to the address where bug reports for this package should be sent. */ 234-#undef PACKAGE_BUGREPORT 235+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" 236 237 /* Define to the full name of this package. */ 238-#undef PACKAGE_NAME 239+#define PACKAGE_NAME "Raptor RDF Parser and Serializer library" 240 241 /* Define to the full name and version of this package. */ 242-#undef PACKAGE_STRING 243+#define PACKAGE_STRING "Raptor RDF Parser and Serializer library 2.0.15" 244 245 /* Define to the one symbol short name of this package. */ 246-#undef PACKAGE_TARNAME 247+#define PACKAGE_TARNAME "raptor2" 248 249 /* Define to the home page for this package. */ 250-#undef PACKAGE_URL 251+#define PACKAGE_URL "" 252 253 /* Define to the version of this package. */ 254-#undef PACKAGE_VERSION 255+#define PACKAGE_VERSION "2.0.15" 256 257 /* Define to 1 if debug messages are enabled. */ 258-#undef RAPTOR_DEBUG 259+/* #undef RAPTOR_DEBUG */ 260 261 /* Use ICU for Unicode NFC check */ 262-#undef RAPTOR_ICU_NFC 263+/* #undef RAPTOR_ICU_NFC */ 264 265 /* does libxml struct xmlEntity have a field etype */ 266-#undef RAPTOR_LIBXML_ENTITY_ETYPE 267+#define RAPTOR_LIBXML_ENTITY_ETYPE 1 268 269 /* does libxml struct xmlEntity have a field name_length */ 270-#undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH 271+/* #undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH */ 272 273 /* does libxml have HTML_PARSE_NONET */ 274-#undef RAPTOR_LIBXML_HTML_PARSE_NONET 275+#define RAPTOR_LIBXML_HTML_PARSE_NONET 1 276 277 /* does libxml xmlSAXHandler have externalSubset field */ 278-#undef RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 279+#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1 280 281 /* does libxml xmlSAXHandler have initialized field */ 282-#undef RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 283+#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1 284 285 /* does libxml have XML_PARSE_NONET */ 286-#undef RAPTOR_LIBXML_XML_PARSE_NONET 287+#define RAPTOR_LIBXML_XML_PARSE_NONET 1 288 289 /* Minimum supported package version */ 290-#undef RAPTOR_MIN_VERSION_DECIMAL 291+#define RAPTOR_MIN_VERSION_DECIMAL 20000 292 293 /* Building GRDDL parser */ 294-#undef RAPTOR_PARSER_GRDDL 295+/* #undef RAPTOR_PARSER_GRDDL */ 296 297 /* Building guess parser */ 298-#undef RAPTOR_PARSER_GUESS 299+#define RAPTOR_PARSER_GUESS 1 300 301 /* Building JSON parser */ 302-#undef RAPTOR_PARSER_JSON 303+/* #undef RAPTOR_PARSER_JSON */ 304 305 /* Building N-Quads parser */ 306-#undef RAPTOR_PARSER_NQUADS 307+/* #undef RAPTOR_PARSER_NQUADS */ 308 309 /* Building N-Triples parser */ 310-#undef RAPTOR_PARSER_NTRIPLES 311+#define RAPTOR_PARSER_NTRIPLES 1 312 313 /* Building RDFA parser */ 314-#undef RAPTOR_PARSER_RDFA 315+/* #undef RAPTOR_PARSER_RDFA */ 316 317 /* Building RDF/XML parser */ 318-#undef RAPTOR_PARSER_RDFXML 319+#define RAPTOR_PARSER_RDFXML 1 320 321 /* Building RSS Tag Soup parser */ 322-#undef RAPTOR_PARSER_RSS 323+#define RAPTOR_PARSER_RSS 1 324 325 /* Building TRiG parser */ 326-#undef RAPTOR_PARSER_TRIG 327+#define RAPTOR_PARSER_TRIG 1 328 329 /* Building Turtle parser */ 330-#undef RAPTOR_PARSER_TURTLE 331+#define RAPTOR_PARSER_TURTLE 1 332 333 /* Building Atom 1.0 serializer */ 334-#undef RAPTOR_SERIALIZER_ATOM 335+#define RAPTOR_SERIALIZER_ATOM 1 336 337 /* Building GraphViz DOT serializer */ 338-#undef RAPTOR_SERIALIZER_DOT 339+#define RAPTOR_SERIALIZER_DOT 1 340 341 /* Building HTML Table serializer */ 342-#undef RAPTOR_SERIALIZER_HTML 343+#define RAPTOR_SERIALIZER_HTML 1 344 345 /* Building JSON serializer */ 346-#undef RAPTOR_SERIALIZER_JSON 347+#define RAPTOR_SERIALIZER_JSON 1 348 349 /* Building N-Quads serializer */ 350-#undef RAPTOR_SERIALIZER_NQUADS 351+#define RAPTOR_SERIALIZER_NQUADS 1 352 353 /* Building N-Triples serializer */ 354-#undef RAPTOR_SERIALIZER_NTRIPLES 355+#define RAPTOR_SERIALIZER_NTRIPLES 1 356 357 /* Building RDF/XML serializer */ 358-#undef RAPTOR_SERIALIZER_RDFXML 359+#define RAPTOR_SERIALIZER_RDFXML 1 360 361 /* Building RDF/XML-abbreviated serializer */ 362-#undef RAPTOR_SERIALIZER_RDFXML_ABBREV 363+#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 364 365 /* Building RSS 1.0 serializer */ 366-#undef RAPTOR_SERIALIZER_RSS_1_0 367+#define RAPTOR_SERIALIZER_RSS_1_0 1 368 369 /* Building Turtle serializer */ 370-#undef RAPTOR_SERIALIZER_TURTLE 371+#define RAPTOR_SERIALIZER_TURTLE 1 372 373 /* Release version as a decimal */ 374-#undef RAPTOR_VERSION_DECIMAL 375+#define RAPTOR_VERSION_DECIMAL 20015 376 377 /* Major version number */ 378-#undef RAPTOR_VERSION_MAJOR 379+#define RAPTOR_VERSION_MAJOR 2 380 381 /* Minor version number */ 382-#undef RAPTOR_VERSION_MINOR 383+#define RAPTOR_VERSION_MINOR 0 384 385 /* Release version number */ 386-#undef RAPTOR_VERSION_RELEASE 387+#define RAPTOR_VERSION_RELEASE 15 388 389 /* Have libcurl WWW library */ 390-#undef RAPTOR_WWW_LIBCURL 391+/* #undef RAPTOR_WWW_LIBCURL */ 392 393 /* Have libfetch WWW library */ 394-#undef RAPTOR_WWW_LIBFETCH 395+/* #undef RAPTOR_WWW_LIBFETCH */ 396 397 /* Have libxml available as a WWW library */ 398-#undef RAPTOR_WWW_LIBXML 399+#define RAPTOR_WWW_LIBXML 1 400 401 /* No WWW library */ 402-#undef RAPTOR_WWW_NONE 403+/* #undef RAPTOR_WWW_NONE */ 404 405 /* Check XML 1.1 Names */ 406-#undef RAPTOR_XML_1_1 407+/* #undef RAPTOR_XML_1_1 */ 408 409 /* Use libxml XML parser */ 410-#undef RAPTOR_XML_LIBXML 411+#define RAPTOR_XML_LIBXML 1 412 413 /* Define to 1 if you have the ANSI C header files. */ 414-#undef STDC_HEADERS 415+#define STDC_HEADERS 1 416 417 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ 418-#undef TIME_WITH_SYS_TIME 419+/* #undef TIME_WITH_SYS_TIME */ 420 421 /* Version number of package */ 422-#undef VERSION 423+#define VERSION "2.0.15" 424 425 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most 426 significant byte first (like Motorola and SPARC, unlike Intel). */ 427@@ -321,13 +322,13 @@ 428 # endif 429 #else 430 # ifndef WORDS_BIGENDIAN 431-# undef WORDS_BIGENDIAN 432+/* # undef WORDS_BIGENDIAN */ 433 # endif 434 #endif 435 436 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a 437 `char[]'. */ 438-#undef YYTEXT_POINTER 439+#define YYTEXT_POINTER 1 440 441 /* Enable large inode numbers on Mac OS X 10.5. */ 442 #ifndef _DARWIN_USE_64_BIT_INODE 443@@ -335,16 +336,20 @@ 444 #endif 445 446 /* Number of bits in a file offset, on hosts where this is settable. */ 447-#undef _FILE_OFFSET_BITS 448+/* #undef _FILE_OFFSET_BITS */ 449 450 /* Define for large files, on AIX-style hosts. */ 451-#undef _LARGE_FILES 452+/* #undef _LARGE_FILES */ 453 454 /* Define to empty if `const' does not conform to ANSI C. */ 455-#undef const 456+/* #undef const */ 457 458 /* Define to `__inline__' or `__inline' if that's what the C compiler 459 calls it, or to nothing if 'inline' is not supported under any name. */ 460 #ifndef __cplusplus 461-#undef inline 462+/* #undef inline */ 463 #endif 464+ 465+# define S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask)) 466+# define S_ISDIR(mode) S_ISTYPE((mode), _S_IFDIR) 467+# define S_ISREG(mode) S_ISTYPE((mode), _S_IFREG) 468--- misc/raptor2-2.0.15/src/sort_r.c 2014-06-30 10:09:40.000000000 -0700 469+++ misc/build/raptor2-2.0.15/src/sort_r.c 2016-08-23 11:02:51.651428000 -0700 470@@ -60,6 +60,7 @@ 471 * data2, @user_data) and returns <0, 0, or >0 for object comparison. 472 * 473 */ 474+RAPTOR_EXTERN_C 475 void 476 raptor_sort_r(void *base, size_t nel, size_t width, 477 raptor_data_compare_arg_handler compar, void *user_data) 478--- misc/raptor2-2.0.15/src/raptor2.h.in 2014-11-01 21:44:04.000000000 -0700 479+++ misc/build/raptor2-2.0.15/src/raptor2.h.in 2016-08-23 11:46:20.581017000 -0700 480@@ -2176,6 +2176,7 @@ 481 void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator); 482 483 /* utility methods */ 484+RAPTOR_API 485 void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compare_arg_handler compar, void *user_data); 486 487 488