author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Thu, 20 Oct 2016 09:26:57 -0700 | |
changeset 7140 | dda35b00b768 |
parent 6386 | 3e1cffd89159 |
child 7661 | aff9737ef6ba |
permissions | -rw-r--r-- |
6386
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
Use standard datatype instead of Linux/BSD "bit type". |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
|
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
XXX file upstream bug |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
|
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
--- gjs-1.43.3/gjs/coverage.cpp 2014-12-21 09:37:11.000000000 -0800 |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ gjs-1.43.3/gjs/coverage.cpp 2015-06-27 19:39:27.290756286 -0700 |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -485,13 +485,13 @@ |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
* we have some profiling data that suggests a good size to |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
* preallocate to. */ |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
GArray *c_side_array = g_array_new(TRUE, TRUE, array_element_size); |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
- u_int32_t js_array_len; |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
+ uint32_t js_array_len; |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
|
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
if (element_clear_func) |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
g_array_set_clear_func(c_side_array, element_clear_func); |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
|
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
if (JS_GetArrayLength(context, js_array, &js_array_len)) { |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
- u_int32_t i = 0; |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
+ uint32_t i = 0; |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
for (; i < js_array_len; ++i) { |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
jsval element; |
3e1cffd89159
23245626 Deliver gjs 1.43.3 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
if (!JS_GetElement(context, js_array, i, &element)) { |