| 1 |
xmw 13/02/27 09:44:36 |
| 2 |
|
| 3 |
Added: libcss-0.1.2-enum-compare.patch |
| 4 |
Log: |
| 5 |
netsurf eclass preparation. Fix enum comparison. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libcss-0.1.2-enum-compare.patch |
| 16 |
=================================================================== |
| 17 |
--- libcss-0.1.2/src/select/properties/helpers.c |
| 18 |
+++ libcss-0.1.2/src/select/properties/helpers.c |
| 19 |
@@ -52,10 +52,12 @@ |
| 20 |
uint16_t value = CSS_BACKGROUND_COLOR_INHERIT; |
| 21 |
css_color color = 0; |
| 22 |
|
| 23 |
- assert(CSS_BACKGROUND_COLOR_INHERIT == CSS_BORDER_COLOR_INHERIT); |
| 24 |
- assert(CSS_BACKGROUND_COLOR_COLOR == CSS_BORDER_COLOR_COLOR); |
| 25 |
+ assert(CSS_BACKGROUND_COLOR_INHERIT == |
| 26 |
+ (enum css_background_color_e)CSS_BORDER_COLOR_INHERIT); |
| 27 |
+ assert(CSS_BACKGROUND_COLOR_COLOR == |
| 28 |
+ (enum css_background_color_e)CSS_BORDER_COLOR_COLOR); |
| 29 |
assert(CSS_BACKGROUND_COLOR_CURRENT_COLOR == |
| 30 |
- CSS_BORDER_COLOR_CURRENT_COLOR); |
| 31 |
+ (enum css_background_color_e)CSS_BORDER_COLOR_CURRENT_COLOR); |
| 32 |
|
| 33 |
if (isInherit(opv) == false) { |
| 34 |
switch (getValue(opv)) { |
| 35 |
--- libcss-0.1.2/src/parse/important.c |
| 36 |
+++ libcss-0.1.2/src/parse/important.c |
| 37 |
@@ -101,9 +101,9 @@ |
| 38 |
case CSS_PROP_BACKGROUND_COLOR: |
| 39 |
case CSS_PROP_COLUMN_RULE_COLOR: |
| 40 |
assert(BACKGROUND_COLOR_SET == |
| 41 |
- BORDER_COLOR_SET); |
| 42 |
+ (enum op_background_color)BORDER_COLOR_SET); |
| 43 |
assert(BACKGROUND_COLOR_SET == |
| 44 |
- COLUMN_RULE_COLOR_SET); |
| 45 |
+ (enum op_background_color)COLUMN_RULE_COLOR_SET); |
| 46 |
|
| 47 |
if (value == BACKGROUND_COLOR_SET) |
| 48 |
offset++; /* colour */ |
| 49 |
@@ -113,10 +113,12 @@ |
| 50 |
case CSS_PROP_CUE_AFTER: |
| 51 |
case CSS_PROP_CUE_BEFORE: |
| 52 |
case CSS_PROP_LIST_STYLE_IMAGE: |
| 53 |
- assert(BACKGROUND_IMAGE_URI == CUE_AFTER_URI); |
| 54 |
- assert(BACKGROUND_IMAGE_URI == CUE_BEFORE_URI); |
| 55 |
+ assert(BACKGROUND_IMAGE_URI == |
| 56 |
+ (enum op_background_image)CUE_AFTER_URI); |
| 57 |
+ assert(BACKGROUND_IMAGE_URI == |
| 58 |
+ (enum op_background_image)CUE_BEFORE_URI); |
| 59 |
assert(BACKGROUND_IMAGE_URI == |
| 60 |
- LIST_STYLE_IMAGE_URI); |
| 61 |
+ (enum op_background_image)LIST_STYLE_IMAGE_URI); |
| 62 |
|
| 63 |
if (value == BACKGROUND_IMAGE_URI) |
| 64 |
offset++; /* string table entry */ |
| 65 |
@@ -141,9 +143,10 @@ |
| 66 |
case CSS_PROP_BORDER_LEFT_WIDTH: |
| 67 |
case CSS_PROP_OUTLINE_WIDTH: |
| 68 |
case CSS_PROP_COLUMN_RULE_WIDTH: |
| 69 |
- assert(BORDER_WIDTH_SET == OUTLINE_WIDTH_SET); |
| 70 |
+ assert(BORDER_WIDTH_SET == |
| 71 |
+ (enum op_border_width)OUTLINE_WIDTH_SET); |
| 72 |
assert(BORDER_WIDTH_SET == |
| 73 |
- COLUMN_RULE_WIDTH_SET); |
| 74 |
+ (enum op_border_width)COLUMN_RULE_WIDTH_SET); |
| 75 |
|
| 76 |
if (value == BORDER_WIDTH_SET) |
| 77 |
offset += 2; /* length + units */ |
| 78 |
@@ -161,14 +164,14 @@ |
| 79 |
case CSS_PROP_WIDTH: |
| 80 |
case CSS_PROP_COLUMN_WIDTH: |
| 81 |
case CSS_PROP_COLUMN_GAP: |
| 82 |
- assert(BOTTOM_SET == LEFT_SET); |
| 83 |
- assert(BOTTOM_SET == RIGHT_SET); |
| 84 |
- assert(BOTTOM_SET == TOP_SET); |
| 85 |
- assert(BOTTOM_SET == HEIGHT_SET); |
| 86 |
- assert(BOTTOM_SET == MARGIN_SET); |
| 87 |
- assert(BOTTOM_SET == WIDTH_SET); |
| 88 |
- assert(BOTTOM_SET == COLUMN_WIDTH_SET); |
| 89 |
- assert(BOTTOM_SET == COLUMN_GAP_SET); |
| 90 |
+ assert(BOTTOM_SET == (enum op_bottom)LEFT_SET); |
| 91 |
+ assert(BOTTOM_SET == (enum op_bottom)RIGHT_SET); |
| 92 |
+ assert(BOTTOM_SET == (enum op_bottom)TOP_SET); |
| 93 |
+ assert(BOTTOM_SET == (enum op_bottom)HEIGHT_SET); |
| 94 |
+ assert(BOTTOM_SET == (enum op_bottom)MARGIN_SET); |
| 95 |
+ assert(BOTTOM_SET == (enum op_bottom)WIDTH_SET); |
| 96 |
+ assert(BOTTOM_SET == (enum op_bottom)COLUMN_WIDTH_SET); |
| 97 |
+ assert(BOTTOM_SET == (enum op_bottom)COLUMN_GAP_SET); |
| 98 |
|
| 99 |
if (value == BOTTOM_SET) |
| 100 |
offset += 2; /* length + units */ |
| 101 |
@@ -231,7 +234,7 @@ |
| 102 |
case CSS_PROP_COUNTER_INCREMENT: |
| 103 |
case CSS_PROP_COUNTER_RESET: |
| 104 |
assert(COUNTER_INCREMENT_NONE == |
| 105 |
- COUNTER_RESET_NONE); |
| 106 |
+ (enum op_counter_increment)COUNTER_RESET_NONE); |
| 107 |
|
| 108 |
while (value != COUNTER_INCREMENT_NONE) { |
| 109 |
offset+=2; /* string + integer */ |
| 110 |
@@ -276,7 +279,8 @@ |
| 111 |
|
| 112 |
case CSS_PROP_LETTER_SPACING: |
| 113 |
case CSS_PROP_WORD_SPACING: |
| 114 |
- assert(LETTER_SPACING_SET == WORD_SPACING_SET); |
| 115 |
+ assert(LETTER_SPACING_SET == |
| 116 |
+ (enum op_letter_spacing)WORD_SPACING_SET); |
| 117 |
|
| 118 |
if (value == LETTER_SPACING_SET) |
| 119 |
offset += 2; /* length + units */ |
| 120 |
@@ -296,7 +300,8 @@ |
| 121 |
|
| 122 |
case CSS_PROP_MAX_HEIGHT: |
| 123 |
case CSS_PROP_MAX_WIDTH: |
| 124 |
- assert(MAX_HEIGHT_SET == MAX_WIDTH_SET); |
| 125 |
+ assert(MAX_HEIGHT_SET == |
| 126 |
+ (enum op_max_height)MAX_WIDTH_SET); |
| 127 |
|
| 128 |
if (value == MAX_HEIGHT_SET) |
| 129 |
offset += 2; /* length + units */ |
| 130 |
@@ -311,11 +316,11 @@ |
| 131 |
case CSS_PROP_PAUSE_AFTER: |
| 132 |
case CSS_PROP_PAUSE_BEFORE: |
| 133 |
case CSS_PROP_TEXT_INDENT: |
| 134 |
- assert(MIN_HEIGHT_SET == MIN_WIDTH_SET); |
| 135 |
- assert(MIN_HEIGHT_SET == PADDING_SET); |
| 136 |
- assert(MIN_HEIGHT_SET == PAUSE_AFTER_SET); |
| 137 |
- assert(MIN_HEIGHT_SET == PAUSE_BEFORE_SET); |
| 138 |
- assert(MIN_HEIGHT_SET == TEXT_INDENT_SET); |
| 139 |
+ assert(MIN_HEIGHT_SET == (enum op_min_height)MIN_WIDTH_SET); |
| 140 |
+ assert(MIN_HEIGHT_SET == (enum op_min_height)PADDING_SET); |
| 141 |
+ assert(MIN_HEIGHT_SET == (enum op_min_height)PAUSE_AFTER_SET); |
| 142 |
+ assert(MIN_HEIGHT_SET == (enum op_min_height)PAUSE_BEFORE_SET); |
| 143 |
+ assert(MIN_HEIGHT_SET == (enum op_min_height)TEXT_INDENT_SET); |
| 144 |
|
| 145 |
if (value == MIN_HEIGHT_SET) |
| 146 |
offset += 2; /* length + units */ |
| 147 |
@@ -331,10 +336,10 @@ |
| 148 |
case CSS_PROP_RICHNESS: |
| 149 |
case CSS_PROP_STRESS: |
| 150 |
case CSS_PROP_WIDOWS: |
| 151 |
- assert(ORPHANS_SET == PITCH_RANGE_SET); |
| 152 |
- assert(ORPHANS_SET == RICHNESS_SET); |
| 153 |
- assert(ORPHANS_SET == STRESS_SET); |
| 154 |
- assert(ORPHANS_SET == WIDOWS_SET); |
| 155 |
+ assert(ORPHANS_SET == (enum op_orphans)PITCH_RANGE_SET); |
| 156 |
+ assert(ORPHANS_SET == (enum op_orphans)RICHNESS_SET); |
| 157 |
+ assert(ORPHANS_SET == (enum op_orphans)STRESS_SET); |
| 158 |
+ assert(ORPHANS_SET == (enum op_orphans)WIDOWS_SET); |
| 159 |
|
| 160 |
if (value == ORPHANS_SET) |
| 161 |
offset++; /* value */ |
Archives