Changeset e1a27be in mainline for uspace/app/vdemo/vdemo.c

Timestamp:

2012-12-29T10:48:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb (diff), c928bb7 (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

File:

• uspace/app/vdemo/vdemo.c (modified) (2 diffs)

uspace/app/vdemo/vdemo.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <malloc.h>
@@ -110 +110 @@
 {
         if (argc >= 2) {
-                window_t *main_window = window_open(argv[1], true, true, "vdemo");
+                window_t *main_window = window_open(argv[1], true, true, "vdemo", 0, 0);
                 if (!main_window) {
                         printf("Cannot open main window.\n");