components/p7zip/patches/compile.patch
author Petr Nyc <Petr.Nyc@Oracle.COM>
Fri, 18 Sep 2015 00:26:21 -0400
branchs11u3-sru
changeset 4874 3c3d9a5b5065
parent 421 032ffcef8039
permissions -rw-r--r--
build metadata for S11.3SRU1.2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
421
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
The "const" changes the function signature, preventing 7z.so from loading
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
because of a missing symbol.
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
--- p7zip_9.20.1/CPP/7zip/Archive/Wim/WimIn.cpp.orig	Mon Jul 18 14:37:02 2011
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
+++ p7zip_9.20.1/CPP/7zip/Archive/Wim/WimIn.cpp	Mon Jul 18 14:37:20 2011
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
@@ -278,7 +278,7 @@
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
 
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
 static const wchar_t *kLongPath = L"[LongPath]";
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
-UString CDatabase::GetItemPath(const int index1) const
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
+UString CDatabase::GetItemPath(int index1) const
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
 {
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
   int size = 0;
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
   int index = index1;