Changeset 58209 in vbox for trunk/src/libs/zlib-1.2.8/zlib.h
- Timestamp:
- Oct 13, 2015 9:56:42 AM (9 years ago)
- Location:
- trunk/src/libs/zlib-1.2.8
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/libs/zlib-1.2.8
-
Property svn:mergeinfo
set to (toggle deleted branches)
/trunk/src/libs/zlib-1.2.6 merged eligible /branches/VBox-3.0/src/libs/zlib-1.2.8 58652,70973 /branches/VBox-3.2/src/libs/zlib-1.2.8 66309,66318 /branches/VBox-4.0/src/libs/zlib-1.2.8 70873 /branches/VBox-4.1/src/libs/zlib-1.2.8 74233,78414,78691,82579,85941,85944-85947,85949-85950,85953,86701,86728,87009 /branches/VBox-4.2/src/libs/zlib-1.2.8 82653,86229-86230,86234,86529,91503-91504,91506-91508,91510,91514-91515,91521 /branches/VBox-4.3/src/libs/zlib-1.2.8 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/zlib-1.2.8 91223 /branches/andy/draganddrop/src/libs/zlib-1.2.8 90781-91268 /branches/andy/guestctrl20/src/libs/zlib-1.2.8 78916,78930 /branches/andy/pdmaudio/src/libs/zlib-1.2.8 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/zlib-1.2.8 92692-94610 /branches/dsen/gui/src/libs/zlib-1.2.8 79076-79078,79089,79109-79110,79112-79113,79127-79130,79134,79141,79151,79155,79157-79159,79193,79197 /branches/dsen/gui2/src/libs/zlib-1.2.8 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/zlib-1.2.8 79645-79692 /trunk/src/src/libs/zlib-1.2.8 92342
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/libs/zlib-1.2.8/zlib.h
r58208 r58209 1699 1699 1700 1700 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) 1701 # ifdef Z_PREFIX_SET 1701 # if defined(VBOX) 1702 # define vboxzlib_gzopen vboxzlib_gzopen64 1703 # define vboxzlib_gzseek vboxzlib_gzseek64 1704 # define vboxzlib_gztell vboxzlib_gztell64 1705 # define vboxzlib_gzoffset vboxzlib_gzoffset64 1706 # define vboxzlib_adler32_combine vboxzlib_adler32_combine64 1707 # define vboxzlib_crc32_combine vboxzlib_crc32_combine64 1708 # elif defined(Z_PREFIX_SET) 1702 1709 # define z_gzopen z_gzopen64 1703 1710 # define z_gzseek z_gzseek64
Note:
See TracChangeset
for help on using the changeset viewer.
