Changeset bf22cb78 in mainline

Timestamp:

2019-11-19T09:21:13Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8b1ce56

Parents:

959ef5d

git-author:

Jiri Svoboda <jiri@…> (2019-11-18 19:21:08)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-19 09:21:13)

Message:

Fix 32-bit build

Location:

uspace

Files:

• lib/display/src/disp_srv.c (modified) (1 diff)
• lib/ipcgfx/src/server.c (modified) (1 diff)
• srv/hid/display/client.c (modified) (1 diff)
• srv/hid/display/display.c (modified) (2 diffs)

uspace/lib/display/src/disp_srv.c

@@ -154 +154 @@
                 }
 
-                printf("display_conn method=%lu\n", method);
+                printf("display_conn method=%u\n", (unsigned) method);
                 switch (method) {
                 case DISPLAY_CALLBACK_CREATE:

uspace/lib/ipcgfx/src/server.c

@@ -163 +163 @@
         srvbmp->bmp = bitmap;
         srvbmp->bmp_id = srvgc->next_bmp_id++;
-        printf("gc_bitmap_create_srv: storing bmp_id=%lu\n", srvbmp->bmp_id);
+        printf("gc_bitmap_create_srv: storing bmp_id=%u\n",
+            (unsigned) srvbmp->bmp_id);
 
         async_answer_1(icall, EOK, srvbmp->bmp_id);

uspace/srv/hid/display/client.c

@@ -127 +127 @@
 
         // TODO Make this faster
-        printf("ds_client_find_window: id=0x%lx\n", id);
+        printf("ds_client_find_window: id=0x%x\n", (unsigned) id);
         wnd = ds_client_first_window(client);
         while (wnd != NULL) {
-                printf("ds_client_find_window: wnd=%p wnd->id=0x%lx\n", wnd, wnd->id);
+                printf("ds_client_find_window: wnd=%p wnd->id=0x%x\n", wnd,
+                    (unsigned) wnd->id);
                 if (wnd->id == id)
                         return wnd;

uspace/srv/hid/display/display.c

@@ -208 +208 @@
         ds_window_t *wnd;
 
-        printf("ds_display_find_window: id=0x%lx\n", id);
+        printf("ds_display_find_window: id=0x%x\n", (unsigned) id);
 
         client = ds_display_first_client(display);
@@ -215 +215 @@
                 wnd = ds_client_find_window(client, id);
                 if (wnd != NULL) {
-                        printf("ds_display_find_window: found wnd=%p id=0x%lx\n",
-                            wnd, wnd->id);
+                        printf("ds_display_find_window: found wnd=%p id=0x%x\n",
+                            wnd, (unsigned) wnd->id);
                         return wnd;
                 }