components/p7zip/patches/pragmapack.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 06 Dec 2011 06:49:05 -0800
changeset 610 b8bf722379b3
parent 421 032ffcef8039
permissions -rw-r--r--
7111691 timezone files packaged with inappropriate preserve=false attribute
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 Studio compilers don't have support for a stack of structure packing,
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
but we don't need full stack support here; just the original switch and
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
back again.
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
--- p7zip_9.20.1/C/Ppmd.h.orig	Sat Jan 22 11:32:30 2011
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
+++ p7zip_9.20.1/C/Ppmd.h	Mon Jul 18 11:38:47 2011
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
@@ -29,7 +29,7 @@
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
 #define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4)
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 #define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4)
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
 
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
-#pragma pack(push,1)
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
+#pragma pack(1)
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
 
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
 /* SEE-contexts for PPM-contexts with masked symbols */
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
 typedef struct
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
@@ -50,7 +50,7 @@
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
   UInt16 SuccessorHigh;
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
 } CPpmd_State;
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
 
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
-#pragma pack(pop)
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
+#pragma pack()
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
 
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
 typedef
032ffcef8039 7068248 p7zip 9.20.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
   #ifdef PPMD_32BIT