diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2013-06-12 10:46:29 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2013-06-12 10:47:11 -0500 |
| commit | 860aa642f0c2000e0e012d59c3cd7e1e985c00dd (patch) | |
| tree | 1bf2d10e28ddd15c8a9da370cd2f6ea06a41c0fa /src/apk_solver_data.h | |
| parent | 78ee4267cd6ceafa678f1b44f01a30f77a377876 (diff) | |
| download | apk-tools-860aa642f0c2000e0e012d59c3cd7e1e985c00dd.tar.gz apk-tools-860aa642f0c2000e0e012d59c3cd7e1e985c00dd.tar.bz2 apk-tools-860aa642f0c2000e0e012d59c3cd7e1e985c00dd.tar.xz apk-tools-860aa642f0c2000e0e012d59c3cd7e1e985c00dd.zip | |
Revert "Revert "solver: increase score fields to 32-bits (from 16-bits)""
This reverts commit a2d873a77c6dd2e7f6219e6941af796e1f904e69.
Diffstat (limited to 'src/apk_solver_data.h')
| -rw-r--r-- | src/apk_solver_data.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/apk_solver_data.h b/src/apk_solver_data.h index 5777325..8076a08 100644 --- a/src/apk_solver_data.h +++ b/src/apk_solver_data.h @@ -17,24 +17,10 @@ #include "apk_provider_data.h" struct apk_score { - union { - struct { -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - unsigned short preference; - unsigned short non_preferred_pinnings; - unsigned short non_preferred_actions; - unsigned short unsatisfied; -#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - unsigned short unsatisfied; - unsigned short non_preferred_actions; - unsigned short non_preferred_pinnings; - unsigned short preference; -#else -#error Unknown endianess. -#endif - }; - uint64_t score; - }; + uint32_t unsatisfied; + uint32_t non_preferred_actions; + uint32_t non_preferred_pinnings; + uint32_t preference; }; struct apk_solver_name_state { |