1--- misc/redland-1.0.17/src/rdf_config.h.in 2013-12-28 08:27:04.000000000 -0800 2+++ misc/build/redland-1.0.17/src/rdf_config.h.in 2016-08-23 18:50:20.613027000 -0700 3@@ -1,370 +1,371 @@ 4+/* src/rdf_config.h. Generated from rdf_config.h.in by configure. */ 5 /* src/rdf_config.h.in. Generated from configure.ac by autoheader. */ 6 7 /* Define if building universal (internal helper macro) */ 8-#undef AC_APPLE_UNIVERSAL_BUILD 9+/* #undef AC_APPLE_UNIVERSAL_BUILD */ 10 11 /* Define to 1 if you have the `argz_add' function. */ 12-#undef HAVE_ARGZ_ADD 13+/* #undef HAVE_ARGZ_ADD */ 14 15 /* Define to 1 if you have the `argz_append' function. */ 16-#undef HAVE_ARGZ_APPEND 17+/* #undef HAVE_ARGZ_APPEND */ 18 19 /* Define to 1 if you have the `argz_count' function. */ 20-#undef HAVE_ARGZ_COUNT 21+/* #undef HAVE_ARGZ_COUNT */ 22 23 /* Define to 1 if you have the `argz_create_sep' function. */ 24-#undef HAVE_ARGZ_CREATE_SEP 25+/* #undef HAVE_ARGZ_CREATE_SEP */ 26 27 /* Define to 1 if you have the <argz.h> header file. */ 28-#undef HAVE_ARGZ_H 29+/* #undef HAVE_ARGZ_H */ 30 31 /* Define to 1 if you have the `argz_insert' function. */ 32-#undef HAVE_ARGZ_INSERT 33+/* #undef HAVE_ARGZ_INSERT */ 34 35 /* Define to 1 if you have the `argz_next' function. */ 36-#undef HAVE_ARGZ_NEXT 37+/* #undef HAVE_ARGZ_NEXT */ 38 39 /* Define to 1 if you have the `argz_stringify' function. */ 40-#undef HAVE_ARGZ_STRINGIFY 41+/* #undef HAVE_ARGZ_STRINGIFY */ 42 43 /* BDB has close method with 2 args */ 44-#undef HAVE_BDB_CLOSE_2_ARGS 45+/* #undef HAVE_BDB_CLOSE_2_ARGS */ 46 47 /* BDB defines DBC */ 48-#undef HAVE_BDB_CURSOR 49+/* #undef HAVE_BDB_CURSOR */ 50 51 /* BDB cursor method has 4 arguments */ 52-#undef HAVE_BDB_CURSOR_4_ARGS 53+/* #undef HAVE_BDB_CURSOR_4_ARGS */ 54 55 /* BDB defines DB_TXN */ 56-#undef HAVE_BDB_DB_TXN 57+/* #undef HAVE_BDB_DB_TXN */ 58 59 /* BDB has fd method with 2 args */ 60-#undef HAVE_BDB_FD_2_ARGS 61+/* #undef HAVE_BDB_FD_2_ARGS */ 62 63 /* Have BDB hash support */ 64-#undef HAVE_BDB_HASH 65+/* #undef HAVE_BDB_HASH */ 66 67 /* BDB has open method with 6 args */ 68-#undef HAVE_BDB_OPEN_6_ARGS 69+/* #undef HAVE_BDB_OPEN_6_ARGS */ 70 71 /* BDB has open method with 7 args */ 72-#undef HAVE_BDB_OPEN_7_ARGS 73+/* #undef HAVE_BDB_OPEN_7_ARGS */ 74 75 /* BDB has set_flags method */ 76-#undef HAVE_BDB_SET_FLAGS 77+/* #undef HAVE_BDB_SET_FLAGS */ 78 79 /* Define to 1 if the system has the type `byte'. */ 80-#undef HAVE_BYTE 81+/* #undef HAVE_BYTE */ 82 83 /* Define to 1 if you have the `closedir' function. */ 84-#undef HAVE_CLOSEDIR 85+#define HAVE_CLOSEDIR 1 86 87 /* BDB has dbopen method */ 88-#undef HAVE_DBOPEN 89+/* #undef HAVE_DBOPEN */ 90 91 /* BDB has db_create method */ 92-#undef HAVE_DB_CREATE 93+/* #undef HAVE_DB_CREATE */ 94 95 /* Define to 1 if you have the <db.h> header file. */ 96-#undef HAVE_DB_H 97+/* #undef HAVE_DB_H */ 98 99 /* BDB has db_open method */ 100-#undef HAVE_DB_OPEN 101+/* #undef HAVE_DB_OPEN */ 102 103 /* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if 104 you don't. */ 105-#undef HAVE_DECL_CYGWIN_CONV_PATH 106+/* #undef HAVE_DECL_CYGWIN_CONV_PATH */ 107 108 /* Define to 1 if you have the <dirent.h> header file. */ 109-#undef HAVE_DIRENT_H 110+#define HAVE_DIRENT_H 1 111 112 /* Define if you have the GNU dld library. */ 113-#undef HAVE_DLD 114+/* #undef HAVE_DLD */ 115 116 /* Define to 1 if you have the <dld.h> header file. */ 117-#undef HAVE_DLD_H 118+/* #undef HAVE_DLD_H */ 119 120 /* Define to 1 if you have the `dlerror' function. */ 121-#undef HAVE_DLERROR 122+#define HAVE_DLERROR 1 123 124 /* Define to 1 if you have the <dlfcn.h> header file. */ 125-#undef HAVE_DLFCN_H 126+/* #undef HAVE_DLFCN_H */ 127 128 /* Define to 1 if you have the <dl.h> header file. */ 129-#undef HAVE_DL_H 130+/* #undef HAVE_DL_H */ 131 132 /* Define if you have the _dyld_func_lookup function. */ 133-#undef HAVE_DYLD 134+/* #undef HAVE_DYLD */ 135 136 /* Define to 1 if you have the <errno.h> header file. */ 137-#undef HAVE_ERRNO_H 138+#define HAVE_ERRNO_H 1 139 140 /* Define to 1 if the system has the type `error_t'. */ 141-#undef HAVE_ERROR_T 142+/* #undef HAVE_ERROR_T */ 143 144 /* Define to 1 if you have the <fcntl.h> header file. */ 145-#undef HAVE_FCNTL_H 146+#define HAVE_FCNTL_H 1 147 148 /* Define to 1 if you have the `getenv' function. */ 149-#undef HAVE_GETENV 150+#define HAVE_GETENV 1 151 152 /* Define to 1 if you have the `getopt' function. */ 153-#undef HAVE_GETOPT 154+#define HAVE_GETOPT 1 155 156 /* Define to 1 if you have the <getopt.h> header file. */ 157-#undef HAVE_GETOPT_H 158+#define HAVE_GETOPT_H 1 159 160 /* Define to 1 if you have the `getopt_long' function. */ 161-#undef HAVE_GETOPT_LONG 162+#define HAVE_GETOPT_LONG 1 163 164 /* Define to 1 if you have the `gettimeofday' function. */ 165-#undef HAVE_GETTIMEOFDAY 166+/* #undef HAVE_GETTIMEOFDAY */ 167 168 /* Define to 1 if you have the <inttypes.h> header file. */ 169-#undef HAVE_INTTYPES_H 170+#define HAVE_INTTYPES_H 1 171 172 /* Define if you have the libdl library or equivalent. */ 173-#undef HAVE_LIBDL 174+#define HAVE_LIBDL 1 175 176 /* Define if libdlloader will be built on this platform */ 177-#undef HAVE_LIBDLLOADER 178+#define HAVE_LIBDLLOADER 1 179 180 /* Define to 1 if you have the <libpq-fe.h> header file. */ 181-#undef HAVE_LIBPQ_FE_H 182+/* #undef HAVE_LIBPQ_FE_H */ 183 184 /* Have local MD5 digest */ 185-#undef HAVE_LOCAL_MD5_DIGEST 186+#define HAVE_LOCAL_MD5_DIGEST 1 187 188 /* Have local RIPEMD160 digest */ 189-#undef HAVE_LOCAL_RIPEMD160_DIGEST 190+/* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ 191 192 /* Have local SHA1 digest */ 193-#undef HAVE_LOCAL_SHA1_DIGEST 194+#define HAVE_LOCAL_SHA1_DIGEST 1 195 196 /* Define this if a modern libltdl is already installed */ 197-#undef HAVE_LTDL 198+#define HAVE_LTDL 1 199 200 /* Define to 1 if you have the <mach-o/dyld.h> header file. */ 201-#undef HAVE_MACH_O_DYLD_H 202+/* #undef HAVE_MACH_O_DYLD_H */ 203 204 /* Define to 1 if you have the `memcmp' function. */ 205-#undef HAVE_MEMCMP 206+#define HAVE_MEMCMP 1 207 208 /* Define to 1 if you have the <memory.h> header file. */ 209-#undef HAVE_MEMORY_H 210+#define HAVE_MEMORY_H 1 211 212 /* Define to 1 if you have the `mkstemp' function. */ 213-#undef HAVE_MKSTEMP 214+/* #undef HAVE_MKSTEMP */ 215 216 /* Define to 1 if you have the `mktemp' function. */ 217-#undef HAVE_MKTEMP 218+#define HAVE_MKTEMP 1 219 220 /* have MYSQL_OPT_RECONNECT declared */ 221-#undef HAVE_MYSQL_OPT_RECONNECT 222+/* #undef HAVE_MYSQL_OPT_RECONNECT */ 223 224 /* Define to 1 if you have the `opendir' function. */ 225-#undef HAVE_OPENDIR 226+#define HAVE_OPENDIR 1 227 228 /* Define if libtool can extract symbol lists from object files. */ 229-#undef HAVE_PRELOADED_SYMBOLS 230+#define HAVE_PRELOADED_SYMBOLS 1 231 232 /* Define to 1 if you have the <pthread.h> header file. */ 233-#undef HAVE_PTHREAD_H 234+#define HAVE_PTHREAD_H 1 235 236 /* Define to 1 if you have the `readdir' function. */ 237-#undef HAVE_READDIR 238+#define HAVE_READDIR 1 239 240 /* Define if you have the shl_load function. */ 241-#undef HAVE_SHL_LOAD 242+/* #undef HAVE_SHL_LOAD */ 243 244 /* Define to 1 if you have the <sqlite3.h> header file. */ 245-#undef HAVE_SQLITE3_H 246+/* #undef HAVE_SQLITE3_H */ 247 248 /* Define to 1 if you have the <sqlite.h> header file. */ 249-#undef HAVE_SQLITE_H 250+/* #undef HAVE_SQLITE_H */ 251 252 /* Define to 1 if you have the <stddef.h> header file. */ 253-#undef HAVE_STDDEF_H 254+#define HAVE_STDDEF_H 1 255 256 /* Define to 1 if you have the <stdint.h> header file. */ 257-#undef HAVE_STDINT_H 258+/* #undef HAVE_STDINT_H */ 259 260 /* Define to 1 if you have the <stdlib.h> header file. */ 261-#undef HAVE_STDLIB_H 262+#define HAVE_STDLIB_H 1 263 264 /* Define to 1 if you have the <strings.h> header file. */ 265-#undef HAVE_STRINGS_H 266+/* #undef HAVE_STRINGS_H */ 267 268 /* Define to 1 if you have the <string.h> header file. */ 269-#undef HAVE_STRING_H 270+#define HAVE_STRING_H 1 271 272 /* Define to 1 if you have the `strlcat' function. */ 273-#undef HAVE_STRLCAT 274+#define HAVE_STRLCAT 1 275 276 /* Define to 1 if you have the `strlcpy' function. */ 277-#undef HAVE_STRLCPY 278+#define HAVE_STRLCPY 1 279 280 /* Define to 1 if you have the <sys/dl.h> header file. */ 281-#undef HAVE_SYS_DL_H 282+/* #undef HAVE_SYS_DL_H */ 283 284 /* Define to 1 if you have the <sys/stat.h> header file. */ 285-#undef HAVE_SYS_STAT_H 286+#define HAVE_SYS_STAT_H 1 287 288 /* Define to 1 if you have the <sys/time.h> header file. */ 289-#undef HAVE_SYS_TIME_H 290+/* #undef HAVE_SYS_TIME_H */ 291 292 /* Define to 1 if you have the <sys/types.h> header file. */ 293-#undef HAVE_SYS_TYPES_H 294+#define HAVE_SYS_TYPES_H 1 295 296 /* Define to 1 if you have the <time.h> header file. */ 297-#undef HAVE_TIME_H 298+#define HAVE_TIME_H 1 299 300 /* Define to 1 if you have the `tmpnam' function. */ 301-#undef HAVE_TMPNAM 302+#define HAVE_TMPNAM 1 303 304 /* Define to 1 if the system has the type `u32'. */ 305-#undef HAVE_U32 306+/* #undef HAVE_U32 */ 307 308 /* Define to 1 if the system has the type `u64'. */ 309-#undef HAVE_U64 310+/* #undef HAVE_U64 */ 311 312 /* Define to 1 if you have the <unistd.h> header file. */ 313-#undef HAVE_UNISTD_H 314+#define HAVE_UNISTD_H 1 315 316 /* This value is set to 1 to indicate that the system argz facility works */ 317-#undef HAVE_WORKING_ARGZ 318+/* #undef HAVE_WORKING_ARGZ */ 319 320 /* Run time assertion checks. */ 321-#undef LIBRDF_ASSERT 322+#define LIBRDF_ASSERT 1 323 324 /* Print run time assertion check failure messages. */ 325-#undef LIBRDF_ASSERT_MESSAGES 326+#define LIBRDF_ASSERT_MESSAGES 1 327 328 /* Release version as a decimal */ 329-#undef LIBRDF_VERSION_DECIMAL 330+#define LIBRDF_VERSION_DECIMAL 10017 331 332 /* Major version number */ 333-#undef LIBRDF_VERSION_MAJOR 334+#define LIBRDF_VERSION_MAJOR 1 335 336 /* Minor version number */ 337-#undef LIBRDF_VERSION_MINOR 338+#define LIBRDF_VERSION_MINOR 0 339 340 /* Release version number */ 341-#undef LIBRDF_VERSION_RELEASE 342+#define LIBRDF_VERSION_RELEASE 17 343 344 /* Define if the OS needs help to load dependent libraries for dlopen(). */ 345-#undef LTDL_DLOPEN_DEPLIBS 346+/* #undef LTDL_DLOPEN_DEPLIBS */ 347 348 /* Define to the system default library search path. */ 349-#undef LT_DLSEARCH_PATH 350+#define LT_DLSEARCH_PATH "/lib:/usr/lib" 351 352 /* The archive extension */ 353-#undef LT_LIBEXT 354+#define LT_LIBEXT "a" 355 356 /* The archive prefix */ 357-#undef LT_LIBPREFIX 358+#define LT_LIBPREFIX "lib" 359 360 /* Define to the extension used for runtime loadable modules, say, ".so". */ 361-#undef LT_MODULE_EXT 362+#define LT_MODULE_EXT ".so" 363 364 /* Define to the name of the environment variable that determines the run-time 365 module search path. */ 366-#undef LT_MODULE_PATH_VAR 367+#define LT_MODULE_PATH_VAR "LD_LIBRARY_PATH" 368 369 /* Define to the sub-directory in which libtool stores uninstalled libraries. 370 */ 371-#undef LT_OBJDIR 372+#define LT_OBJDIR ".libs/" 373 374 /* Define to the shared library suffix, say, ".dylib". */ 375-#undef LT_SHARED_EXT 376+/* #undef LT_SHARED_EXT */ 377 378 /* Build storage backends as modules */ 379-#undef MODULAR_LIBRDF 380+/* #undef MODULAR_LIBRDF */ 381 382 /* Define if dlsym() requires a leading underscore in symbol names. */ 383-#undef NEED_USCORE 384+/* #undef NEED_USCORE */ 385 386 /* Define to 1 if your C compiler doesn't accept -c and -o together. */ 387-#undef NO_MINUS_C_MINUS_O 388+/* #undef NO_MINUS_C_MINUS_O */ 389 390 /* Name of package */ 391-#undef PACKAGE 392+#define PACKAGE "redland" 393 394 /* Define to the address where bug reports for this package should be sent. */ 395-#undef PACKAGE_BUGREPORT 396+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" 397 398 /* Define to the full name of this package. */ 399-#undef PACKAGE_NAME 400+#define PACKAGE_NAME "Redland librdf RDF API Library" 401 402 /* Define to the full name and version of this package. */ 403-#undef PACKAGE_STRING 404+#define PACKAGE_STRING "Redland librdf RDF API Library 1.0.17" 405 406 /* Define to the one symbol short name of this package. */ 407-#undef PACKAGE_TARNAME 408+#define PACKAGE_TARNAME "redland" 409 410 /* Define to the home page for this package. */ 411-#undef PACKAGE_URL 412+#define PACKAGE_URL "" 413 414 /* Define to the version of this package. */ 415-#undef PACKAGE_VERSION 416+#define PACKAGE_VERSION "1.0.17" 417 418 /* The size of `unsigned char', as computed by sizeof. */ 419-#undef SIZEOF_UNSIGNED_CHAR 420+#define SIZEOF_UNSIGNED_CHAR 1 421 422 /* The size of `unsigned int', as computed by sizeof. */ 423-#undef SIZEOF_UNSIGNED_INT 424+#define SIZEOF_UNSIGNED_INT 4 425 426 /* The size of `unsigned long', as computed by sizeof. */ 427-#undef SIZEOF_UNSIGNED_LONG 428+#define SIZEOF_UNSIGNED_LONG 8 429 430 /* The size of `unsigned long long', as computed by sizeof. */ 431-#undef SIZEOF_UNSIGNED_LONG_LONG 432+#define SIZEOF_UNSIGNED_LONG_LONG 8 433 434 /* define to SQLINTEGER if not defined in the ODBC headers */ 435-#undef SQLLEN 436+#define SQLLEN SQLINTEGER 437 438 /* define to SQLUINTEGER if not defined in the ODBC headers */ 439-#undef SQLULEN 440+#define SQLULEN SQLUINTEGER 441 442 /* Define to 1 if you have the ANSI C header files. */ 443-#undef STDC_HEADERS 444+#define STDC_HEADERS 1 445 446 /* Building file storage */ 447-#undef STORAGE_FILE 448+#define STORAGE_FILE 1 449 450 /* Building hashes storage */ 451-#undef STORAGE_HASHES 452+#define STORAGE_HASHES 1 453 454 /* Building memory storage */ 455-#undef STORAGE_MEMORY 456+#define STORAGE_MEMORY 1 457 458 /* Building MySQL storage */ 459-#undef STORAGE_MYSQL 460+/* #undef STORAGE_MYSQL */ 461 462 /* Building PostgreSQL storage */ 463-#undef STORAGE_POSTGRESQL 464+/* #undef STORAGE_POSTGRESQL */ 465 466 /* Building SQLite storage */ 467-#undef STORAGE_SQLITE 468+/* #undef STORAGE_SQLITE */ 469 470 /* Building trees storage */ 471-#undef STORAGE_TREES 472+#define STORAGE_TREES 1 473 474 /* Building 3store storage */ 475-#undef STORAGE_TSTORE 476+/* #undef STORAGE_TSTORE */ 477 478 /* Building Virtuoso storage */ 479-#undef STORAGE_VIRTUOSO 480+/* #undef STORAGE_VIRTUOSO */ 481 482 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ 483-#undef TIME_WITH_SYS_TIME 484+/* #undef TIME_WITH_SYS_TIME */ 485 486 /* Version number of package */ 487-#undef VERSION 488+#define VERSION "1.0.17" 489 490 /* Use POSIX threads */ 491-#undef WITH_THREADS 492+#define WITH_THREADS 1 493 494 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most 495 significant byte first (like Motorola and SPARC, unlike Intel). */ 496@@ -374,15 +375,15 @@ 497 # endif 498 #else 499 # ifndef WORDS_BIGENDIAN 500-# undef WORDS_BIGENDIAN 501+/* # undef WORDS_BIGENDIAN */ 502 # endif 503 #endif 504 505 /* Define so that glibc/gnulib argp.h does not typedef error_t. */ 506-#undef __error_t_defined 507+#define __error_t_defined 1 508 509 /* Define to empty if `const' does not conform to ANSI C. */ 510-#undef const 511+/* #undef const */ 512 513 /* Define to a type to use for `error_t' if it is not otherwise available. */ 514-#undef error_t 515+#define error_t int 516--- misc/redland-1.0.17/src/win32_rdf_config.h 2013-12-28 08:31:20.000000000 -0800 517+++ misc/build/redland-1.0.17/src/win32_rdf_config.h 2016-08-23 21:21:09.275863000 -0700 518@@ -53,6 +53,15 @@ 519 #define unlink _unlink 520 #define mktemp _mktemp 521 522+/* definition from winsock2.h */ 523+#ifndef _TIMEVAL_DEFINED 524+#define _TIMEVAL_DEFINED 525+typedef struct timeval { 526+ long tv_sec; 527+ long tv_usec; 528+} timeval; 529+#endif 530+ 531 #define HAVE_C99_VSNPRINTF 1 532 533 /* Define the following if you are calling the librdf from C# or any language which uses stdcall */ 534@@ -75,42 +84,6 @@ 535 * Defines that come from rdf_config.h 536 */ 537 538-/* BDB has close method with 2 args */ 539-#define HAVE_BDB_CLOSE_2_ARGS 1 540- 541-/* BDB defines DBC */ 542-#define HAVE_BDB_CURSOR 1 543- 544-/* BDB cursor method has 4 arguments */ 545-#define HAVE_BDB_CURSOR_4_ARGS 1 546- 547-/* BDB defines DB_TXN */ 548-#define HAVE_BDB_DB_TXN 1 549- 550-/* BDB has fd method with 2 args */ 551-#define HAVE_BDB_FD_2_ARGS 1 552- 553-/* Have BDB hash support */ 554-#define HAVE_BDB_HASH 1 555- 556-/* BDB has open method with 6 args */ 557-/* #undef HAVE_BDB_OPEN_6_ARGS */ 558- 559-/* BDB has open method with 7 args */ 560-#define HAVE_BDB_OPEN_7_ARGS 1 561- 562-/* BDB has set_flags method */ 563-#define HAVE_BDB_SET_FLAGS 1 564- 565-/* BDB has dbopen method */ 566-/* #undef HAVE_DBOPEN */ 567- 568-/* BDB has db_create method */ 569-#define HAVE_DB_CREATE 1 570- 571-/* Define to 1 if you have the <db.h> header file. */ 572-#define HAVE_DB_H 1 573- 574 /* Define to 1 if you have the <dlfcn.h> header file. */ 575 /* undef HAVE_DLFCN_H */ 576 577@@ -263,7 +236,7 @@ 578 /*#undef STORAGE_POSTGRESQL*/ 579 580 /* Building SQLite storage */ 581-#define STORAGE_SQLITE 1 582+/*#undef STORAGE_SQLITE 1 */ 583 584 /* Building 3store storage */ 585 /*#undef STORAGE_TSTORE*/ 586--- misc/redland-1.0.17/src/rdf_concepts.c 2013-11-13 14:54:40.000000000 -0800 587+++ misc/build/redland-1.0.17/src/rdf_concepts.c 2016-08-23 22:42:25.559352000 -0700 588@@ -90,7 +90,9 @@ 589 /* Create the Unique URI objects */ 590 world->concept_ms_namespace_uri = librdf_new_uri(world, librdf_concept_ms_namespace); 591 world->concept_schema_namespace_uri = librdf_new_uri(world, librdf_concept_schema_namespace); 592- world->xsd_namespace_uri = librdf_new_uri(world, raptor_xmlschema_datatypes_namespace_uri); 593+ /* MSVC does not seem to be able to export global data from DLLs */ 594+ /* world->xsd_namespace_uri = librdf_new_uri(world, raptor_xmlschema_datatypes_namespace_uri); */ 595+ world->xsd_namespace_uri = librdf_new_uri(world, "http://www.w3.org/2001/XMLSchema#"); 596 if(!world->concept_ms_namespace_uri || 597 !world->concept_schema_namespace_uri || 598 !world->xsd_namespace_uri) 599