Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Rename 'rand' variable to avoid conflict. |
| 2 | |
| 3 | Upstream-Status: pending |
| 4 | Signed-off-by: Bjรถrn Stenberg <bjst@enea.com> |
| 5 | |
| 6 | diff -u glib-2.34.3/tests/refcount/signals.c~ glib-2.34.3/tests/refcount/signals.c |
| 7 | --- glib-2.34.3/tests/refcount/signals.c 2012-11-26 17:52:48.000000000 +0100 |
| 8 | +++ glib-2.34.3/tests/refcount/signals.c 2013-02-08 14:24:10.052477546 +0100 |
| 9 | @@ -9,7 +9,7 @@ |
| 10 | #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) |
| 11 | #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) |
| 12 | |
| 13 | -static GRand *rand; |
| 14 | +static GRand *grand; |
| 15 | |
| 16 | typedef struct _GTest GTest; |
| 17 | typedef struct _GTestClass GTestClass; |
| 18 | @@ -84,7 +84,7 @@ |
| 19 | NULL |
| 20 | }; |
| 21 | |
| 22 | - rand = g_rand_new(); |
| 23 | + grand = g_rand_new(); |
| 24 | |
| 25 | test_type = g_type_register_static (G_TYPE_OBJECT, "GTest", |
| 26 | &test_info, 0); |
| 27 | @@ -218,7 +218,7 @@ |
| 28 | static void |
| 29 | my_test_do_prop (GTest * test) |
| 30 | { |
| 31 | - test->value = g_rand_int (rand); |
| 32 | + test->value = g_rand_int (grand); |
| 33 | g_object_notify (G_OBJECT (test), "test-prop"); |
| 34 | } |
| 35 | |