Changeset 51767 in vbox for trunk/include

Timestamp:

Jul 1, 2014 12:41:09 PM (11 years ago)

Author:

vboxsync

Message:

conflict avoidance by more alphabetical sorting.

File:

trunk/include/iprt/mangling.h

-              r51715
+              r51767
 # define RTZipGzipCompressIoStream                      RT_MANGLER(RTZipGzipCompressIoStream)
 # define RTZipGzipDecompressIoStream                    RT_MANGLER(RTZipGzipDecompressIoStream)
+# define RTZipPkzipFsStreamFromIoStream                 RT_MANGLER(RTZipPkzipFsStreamFromIoStream)
+# define RTZipPkzipMemDecompress                        RT_MANGLER(RTZipPkzipMemDecompress)
 # define RTZipTarCmd                                    RT_MANGLER(RTZipTarCmd)
 # define RTZipUnzipCmd                                  RT_MANGLER(RTZipUnzipCmd)
 # define RTZipTarFsStreamFromIoStream                   RT_MANGLER(RTZipTarFsStreamFromIoStream)
 # define RTZipXarFsStreamFromIoStream                   RT_MANGLER(RTZipXarFsStreamFromIoStream)
-# define RTZipPkzipFsStreamFromIoStream                 RT_MANGLER(RTZipPkzipFsStreamFromIoStream)
-# define RTZipPkzipMemDecompress                        RT_MANGLER(RTZipPkzipMemDecompress)
 /*
  * Stable variables (alphabetical order):

Note: See TracChangeset for help on using the changeset viewer.