Changeset 6843a9c in mainline for uspace/app/tester/fault/fault2.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/app/tester/fault/fault2.c (modified) (1 diff)

uspace/app/tester/fault/fault2.c

@@ -35 +35 @@
 const char *test_fault2(void)
 {
-        volatile long long var;
-        volatile int var1;
-        
-        var1 = *((aliasing_int *) (((char *) (&var)) + 1));
+        volatile long long var = 0;
+        volatile int var1 = *((aliasing_int *) (((char *) (&var)) + 1));
         printf("Read %d\n", var1);