Changeset 58081 in vbox for trunk/src/libs/libxml2-2.9.2/include/libxml
- Timestamp:
- Oct 7, 2015 11:01:53 AM (9 years ago)
- Location:
- trunk/src/libs/libxml2-2.9.2
- Files:
-
- 4 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/libs/libxml2-2.9.2
-
Property svn:mergeinfo
set to (toggle deleted branches)
/trunk/src/libs/libxml2-2.6.31 merged eligible /branches/VBox-3.0/src/libs/libxml2-2.9.2 58652,70973 /branches/VBox-3.2/src/libs/libxml2-2.9.2 66309,66318 /branches/VBox-4.0/src/libs/libxml2-2.9.2 70873 /branches/VBox-4.1/src/libs/libxml2-2.9.2 74233,78414,78691,82579,85941,85944-85947,85949-85950,85953,86701,86728,87009 /branches/VBox-4.2/src/libs/libxml2-2.9.2 82653,86229-86230,86234,86529,91503-91504,91506-91508,91510,91514-91515,91521 /branches/VBox-4.3/src/libs/libxml2-2.9.2 89714,91223,94066,94839,94897,95154,95164,95167,95295,95338,95353-95354,95356,95367,95451,95475,95477,95480,95507,95640,95659,95661,95663,98913-98915,99358 /branches/VBox-4.3/trunk/src/libs/libxml2-2.9.2 91223 /branches/andy/draganddrop/src/libs/libxml2-2.9.2 90781-91268 /branches/andy/guestctrl20/src/libs/libxml2-2.9.2 78916,78930 /branches/andy/pdmaudio/src/libs/libxml2-2.9.2 94582,94641,94654,94688,94778,94783,94816,95197,95215-95216,95250,95279,95505-95506,95543,95694,96323,96470-96471,96582,96587,96802-96803,96817,96904,96967,96999,97020-97021,97025,97050,97099 /branches/bird/hardenedwindows/src/libs/libxml2-2.9.2 92692-94610 /branches/dsen/gui/src/libs/libxml2-2.9.2 79076-79078,79089,79109-79110,79112-79113,79127-79130,79134,79141,79151,79155,79157-79159,79193,79197 /branches/dsen/gui2/src/libs/libxml2-2.9.2 79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644 /branches/dsen/gui3/src/libs/libxml2-2.9.2 79645-79692 /trunk/src/src/libs/libxml2-2.9.2 92342
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/libs/libxml2-2.9.2/include/libxml/xmlexports.h
r58072 r58081 153 153 #endif 154 154 155 /* bird/VirtualBox: Visibility attributes - start */ 156 /* frank: changed to "hidden" */ 157 #if defined(VBOX_HAVE_VISIBILITY_HIDDEN) && !defined(LIBXML_STATIC) && defined(IN_LIBXML) 158 #undef XMLPUBFUN 159 #undef XMLPUBVAR 160 #define XMLPUBFUN __attribute__((visibility("hidden"))) 161 #define XMLPUBVAR __attribute__((visibility("hidden"))) extern 162 #endif 163 /* bird/VirtualBox: Visibility attributes - end */ 164 165 155 166 /* Compatibility */ 156 167 #if !defined(LIBXML_DLL_IMPORT) -
trunk/src/libs/libxml2-2.9.2/include/libxml/xmlmemory.h
r58072 r58081 27 27 /* #define DEBUG_MEMORY_LOCATION */ 28 28 29 #ifndef VBOX /* Avoid spewing out boring libxml2 memory logging. */ 29 30 #ifdef DEBUG 30 31 #ifndef DEBUG_MEMORY … … 32 33 #endif 33 34 #endif 35 #endif /* !VBOX */ 34 36 35 37 /** -
trunk/src/libs/libxml2-2.9.2/include/libxml/xmlversion-default.h
r58076 r58081 175 175 * Whether the FTP support is configured in 176 176 */ 177 #if 1177 #ifndef VBOX 178 178 #define LIBXML_FTP_ENABLED 179 179 #endif … … 184 184 * Whether the HTTP support is configured in 185 185 */ 186 #if 1186 #ifndef VBOX 187 187 #define LIBXML_HTTP_ENABLED 188 188 #endif … … 406 406 * Whether the Lzma support is compiled in 407 407 */ 408 #if 1408 #ifndef VBOX 409 409 #define LIBXML_LZMA_ENABLED 410 410 #endif -
trunk/src/libs/libxml2-2.9.2/include/libxml/xmlversion.h
r58072 r58081 1 1 /* 2 * Summary: compile-time version informations 3 * Description: compile-time version informations for the XML library 4 * 5 * Copy: See Copyright for the status of this software. 6 * 7 * Author: Daniel Veillard 2 * Include a proper pre-generated xmlversion file. 3 * Note that configuration scripts will overwrite this file using a 4 * xmlversion.h.in template. 8 5 */ 9 6 10 #ifndef __XML_VERSION_H__ 11 #define __XML_VERSION_H__ 12 13 #include <libxml/xmlexports.h> 14 15 #ifdef __cplusplus 16 extern "C" { 7 #ifdef RT_OS_WINDOWS 8 # include <libxml/xmlversion-win.h> 9 #else 10 # include <libxml/xmlversion-default.h> 17 11 #endif 18 19 /*20 * use those to be sure nothing nasty will happen if21 * your library and includes mismatch22 */23 #ifndef LIBXML2_COMPILING_MSCCDEF24 XMLPUBFUN void XMLCALL xmlCheckVersion(int version);25 #endif /* LIBXML2_COMPILING_MSCCDEF */26 27 /**28 * LIBXML_DOTTED_VERSION:29 *30 * the version string like "1.2.3"31 */32 #define LIBXML_DOTTED_VERSION "2.9.2"33 34 /**35 * LIBXML_VERSION:36 *37 * the version number: 1.2.3 value is 1020338 */39 #define LIBXML_VERSION 2090240 41 /**42 * LIBXML_VERSION_STRING:43 *44 * the version number string, 1.2.3 value is "10203"45 */46 #define LIBXML_VERSION_STRING "20902"47 48 /**49 * LIBXML_VERSION_EXTRA:50 *51 * extra version information, used to show a CVS compilation52 */53 #define LIBXML_VERSION_EXTRA "-GITv2.9.2-rc2-10-gbe2a7ed"54 55 /**56 * LIBXML_TEST_VERSION:57 *58 * Macro to check that the libxml version in use is compatible with59 * the version the software has been compiled against60 */61 #define LIBXML_TEST_VERSION xmlCheckVersion(20902);62 63 #ifndef VMS64 #if 065 /**66 * WITH_TRIO:67 *68 * defined if the trio support need to be configured in69 */70 #define WITH_TRIO71 #else72 /**73 * WITHOUT_TRIO:74 *75 * defined if the trio support should not be configured in76 */77 #define WITHOUT_TRIO78 #endif79 #else /* VMS */80 /**81 * WITH_TRIO:82 *83 * defined if the trio support need to be configured in84 */85 #define WITH_TRIO 186 #endif /* VMS */87 88 /**89 * LIBXML_THREAD_ENABLED:90 *91 * Whether the thread support is configured in92 */93 #if 194 #if defined(_REENTRANT) || defined(__MT__) || \95 (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))96 #define LIBXML_THREAD_ENABLED97 #endif98 #endif99 100 /**101 * LIBXML_THREAD_ALLOC_ENABLED:102 *103 * Whether the allocation hooks are per-thread104 */105 #if 0106 #define LIBXML_THREAD_ALLOC_ENABLED107 #endif108 109 /**110 * LIBXML_TREE_ENABLED:111 *112 * Whether the DOM like tree manipulation API support is configured in113 */114 #if 1115 #define LIBXML_TREE_ENABLED116 #endif117 118 /**119 * LIBXML_OUTPUT_ENABLED:120 *121 * Whether the serialization/saving support is configured in122 */123 #if 1124 #define LIBXML_OUTPUT_ENABLED125 #endif126 127 /**128 * LIBXML_PUSH_ENABLED:129 *130 * Whether the push parsing interfaces are configured in131 */132 #if 1133 #define LIBXML_PUSH_ENABLED134 #endif135 136 /**137 * LIBXML_READER_ENABLED:138 *139 * Whether the xmlReader parsing interface is configured in140 */141 #if 1142 #define LIBXML_READER_ENABLED143 #endif144 145 /**146 * LIBXML_PATTERN_ENABLED:147 *148 * Whether the xmlPattern node selection interface is configured in149 */150 #if 1151 #define LIBXML_PATTERN_ENABLED152 #endif153 154 /**155 * LIBXML_WRITER_ENABLED:156 *157 * Whether the xmlWriter saving interface is configured in158 */159 #if 1160 #define LIBXML_WRITER_ENABLED161 #endif162 163 /**164 * LIBXML_SAX1_ENABLED:165 *166 * Whether the older SAX1 interface is configured in167 */168 #if 1169 #define LIBXML_SAX1_ENABLED170 #endif171 172 /**173 * LIBXML_FTP_ENABLED:174 *175 * Whether the FTP support is configured in176 */177 #if 1178 #define LIBXML_FTP_ENABLED179 #endif180 181 /**182 * LIBXML_HTTP_ENABLED:183 *184 * Whether the HTTP support is configured in185 */186 #if 1187 #define LIBXML_HTTP_ENABLED188 #endif189 190 /**191 * LIBXML_VALID_ENABLED:192 *193 * Whether the DTD validation support is configured in194 */195 #if 1196 #define LIBXML_VALID_ENABLED197 #endif198 199 /**200 * LIBXML_HTML_ENABLED:201 *202 * Whether the HTML support is configured in203 */204 #if 1205 #define LIBXML_HTML_ENABLED206 #endif207 208 /**209 * LIBXML_LEGACY_ENABLED:210 *211 * Whether the deprecated APIs are compiled in for compatibility212 */213 #if 1214 #define LIBXML_LEGACY_ENABLED215 #endif216 217 /**218 * LIBXML_C14N_ENABLED:219 *220 * Whether the Canonicalization support is configured in221 */222 #if 1223 #define LIBXML_C14N_ENABLED224 #endif225 226 /**227 * LIBXML_CATALOG_ENABLED:228 *229 * Whether the Catalog support is configured in230 */231 #if 1232 #define LIBXML_CATALOG_ENABLED233 #endif234 235 /**236 * LIBXML_DOCB_ENABLED:237 *238 * Whether the SGML Docbook support is configured in239 */240 #if 1241 #define LIBXML_DOCB_ENABLED242 #endif243 244 /**245 * LIBXML_XPATH_ENABLED:246 *247 * Whether XPath is configured in248 */249 #if 1250 #define LIBXML_XPATH_ENABLED251 #endif252 253 /**254 * LIBXML_XPTR_ENABLED:255 *256 * Whether XPointer is configured in257 */258 #if 1259 #define LIBXML_XPTR_ENABLED260 #endif261 262 /**263 * LIBXML_XINCLUDE_ENABLED:264 *265 * Whether XInclude is configured in266 */267 #if 1268 #define LIBXML_XINCLUDE_ENABLED269 #endif270 271 /**272 * LIBXML_ICONV_ENABLED:273 *274 * Whether iconv support is available275 */276 #if 1277 #define LIBXML_ICONV_ENABLED278 #endif279 280 /**281 * LIBXML_ICU_ENABLED:282 *283 * Whether icu support is available284 */285 #if 0286 #define LIBXML_ICU_ENABLED287 #endif288 289 /**290 * LIBXML_ISO8859X_ENABLED:291 *292 * Whether ISO-8859-* support is made available in case iconv is not293 */294 #if 1295 #define LIBXML_ISO8859X_ENABLED296 #endif297 298 /**299 * LIBXML_DEBUG_ENABLED:300 *301 * Whether Debugging module is configured in302 */303 #if 1304 #define LIBXML_DEBUG_ENABLED305 #endif306 307 /**308 * DEBUG_MEMORY_LOCATION:309 *310 * Whether the memory debugging is configured in311 */312 #if 0313 #define DEBUG_MEMORY_LOCATION314 #endif315 316 /**317 * LIBXML_DEBUG_RUNTIME:318 *319 * Whether the runtime debugging is configured in320 */321 #if 0322 #define LIBXML_DEBUG_RUNTIME323 #endif324 325 /**326 * LIBXML_UNICODE_ENABLED:327 *328 * Whether the Unicode related interfaces are compiled in329 */330 #if 1331 #define LIBXML_UNICODE_ENABLED332 #endif333 334 /**335 * LIBXML_REGEXP_ENABLED:336 *337 * Whether the regular expressions interfaces are compiled in338 */339 #if 1340 #define LIBXML_REGEXP_ENABLED341 #endif342 343 /**344 * LIBXML_AUTOMATA_ENABLED:345 *346 * Whether the automata interfaces are compiled in347 */348 #if 1349 #define LIBXML_AUTOMATA_ENABLED350 #endif351 352 /**353 * LIBXML_EXPR_ENABLED:354 *355 * Whether the formal expressions interfaces are compiled in356 */357 #if 1358 #define LIBXML_EXPR_ENABLED359 #endif360 361 /**362 * LIBXML_SCHEMAS_ENABLED:363 *364 * Whether the Schemas validation interfaces are compiled in365 */366 #if 1367 #define LIBXML_SCHEMAS_ENABLED368 #endif369 370 /**371 * LIBXML_SCHEMATRON_ENABLED:372 *373 * Whether the Schematron validation interfaces are compiled in374 */375 #if 1376 #define LIBXML_SCHEMATRON_ENABLED377 #endif378 379 /**380 * LIBXML_MODULES_ENABLED:381 *382 * Whether the module interfaces are compiled in383 */384 #if 1385 #define LIBXML_MODULES_ENABLED386 /**387 * LIBXML_MODULE_EXTENSION:388 *389 * the string suffix used by dynamic modules (usually shared libraries)390 */391 #define LIBXML_MODULE_EXTENSION ".so"392 #endif393 394 /**395 * LIBXML_ZLIB_ENABLED:396 *397 * Whether the Zlib support is compiled in398 */399 #if 1400 #define LIBXML_ZLIB_ENABLED401 #endif402 403 /**404 * LIBXML_LZMA_ENABLED:405 *406 * Whether the Lzma support is compiled in407 */408 #if 1409 #define LIBXML_LZMA_ENABLED410 #endif411 412 #ifdef __GNUC__413 #ifdef HAVE_ANSIDECL_H414 #include <ansidecl.h>415 #endif416 417 /**418 * ATTRIBUTE_UNUSED:419 *420 * Macro used to signal to GCC unused function parameters421 */422 423 #ifndef ATTRIBUTE_UNUSED424 # if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))425 # define ATTRIBUTE_UNUSED __attribute__((unused))426 # else427 # define ATTRIBUTE_UNUSED428 # endif429 #endif430 431 /**432 * LIBXML_ATTR_ALLOC_SIZE:433 *434 * Macro used to indicate to GCC this is an allocator function435 */436 437 #ifndef LIBXML_ATTR_ALLOC_SIZE438 # if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))439 # define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))440 # else441 # define LIBXML_ATTR_ALLOC_SIZE(x)442 # endif443 #else444 # define LIBXML_ATTR_ALLOC_SIZE(x)445 #endif446 447 /**448 * LIBXML_ATTR_FORMAT:449 *450 * Macro used to indicate to GCC the parameter are printf like451 */452 453 #ifndef LIBXML_ATTR_FORMAT454 # if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))455 # define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))456 # else457 # define LIBXML_ATTR_FORMAT(fmt,args)458 # endif459 #else460 # define LIBXML_ATTR_FORMAT(fmt,args)461 #endif462 463 #else /* ! __GNUC__ */464 /**465 * ATTRIBUTE_UNUSED:466 *467 * Macro used to signal to GCC unused function parameters468 */469 #define ATTRIBUTE_UNUSED470 /**471 * LIBXML_ATTR_ALLOC_SIZE:472 *473 * Macro used to indicate to GCC this is an allocator function474 */475 #define LIBXML_ATTR_ALLOC_SIZE(x)476 /**477 * LIBXML_ATTR_FORMAT:478 *479 * Macro used to indicate to GCC the parameter are printf like480 */481 #define LIBXML_ATTR_FORMAT(fmt,args)482 #endif /* __GNUC__ */483 484 #ifdef __cplusplus485 }486 #endif /* __cplusplus */487 #endif488 489
Note:
See TracChangeset
for help on using the changeset viewer.