diff mbox

[patch+7.8?] Fix --with-babeltrace with gcc-4.9.1

Message ID 53EB348B.7010408@codesourcery.com
State Committed
Headers

Commit Message

Yao Qi Aug. 13, 2014, 9:48 a.m. UTC 
  On 08/13/2014 11:05 AM, Doug Evans wrote:
> I suspect it'll be useful to be able to refer to this reasoning at
> some point in the future.
> [ref: the "incompatible pointer type" warning is related to the
> assignment to scope, not pos].
> Maybe this thread is sufficient, or maybe you could add something to
> the commit message.

I add something into the commit message as below.  Patch is committed
to mainline and 7.8 branch.
diff mbox

Patch

diff --git a/gdb/configure b/gdb/configure
index 809326a..874922d 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -15344,6 +15344,7 @@  struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL));
 			struct bt_ctf_event *event = NULL;
 			const struct bt_definition *scope;
 
+			bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
 			scope = bt_ctf_get_top_level_scope (event,
 			      				   BT_STREAM_EVENT_HEADER);
 		        bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 70d0964..61919b4 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2437,6 +2437,7 @@  else
 			struct bt_ctf_event *event = NULL;
 			const struct bt_definition *scope;
 
+			bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
 			scope = bt_ctf_get_top_level_scope (event,
 			      				   BT_STREAM_EVENT_HEADER);
 		        bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));