Merge branch 'master' into bindings/python
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sun, 20 Jan 2013 17:57:42 +0000 (12:57 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sun, 20 Jan 2013 17:57:42 +0000 (12:57 -0500)
tests/lib/Makefile.am
types/array.c

index f7e32c2b70f9aba6c507821a3fe77efe4da9aa5f..e9e264bbbb17c5756f1243f33f42b8fc0cc691d9 100644 (file)
@@ -12,7 +12,7 @@ noinst_PROGRAMS = test-seeks
 
 test_seeks_SOURCES = test-seeks.c
 
-EXTRA_DIST = README.tap
+EXTRA_DIST = README.tap runall.sh
 
 check-am:
        ./runall.sh
index 3a92ef769fff5684680b616c0391678226709ecc..494210827ff80ab301479b6aa4537d49c24684b7 100644 (file)
@@ -84,8 +84,7 @@ struct declaration_array *
        array_declaration->elem = elem_declaration;
        array_declaration->scope = new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_ARRAY;
-       /* No need to align the array, the first element will align itself */
-       declaration->alignment = 1;
+       declaration->alignment = elem_declaration->alignment;
        declaration->declaration_free = _array_declaration_free;
        declaration->definition_new = _array_definition_new;
        declaration->definition_free = _array_definition_free;
This page took 0.026978 seconds and 4 git commands to generate.