Changeset db71e2a in mainline for uspace/lib/gui/window.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/lib/gui/window.h (modified) (2 diffs)

uspace/lib/gui/window.h

@@ -47 +47 @@
 #include "widget.h"
 
-typedef struct window {
+struct window {
         bool is_main; /**< True for the main window of the application. */
         bool is_decorated; /**< True if the window decorations should be rendered. */
@@ -60 +60 @@
         fibril_mutex_t guard; /**< Mutex guarding window surface. */
         surface_t *surface; /**< Window surface shared with compositor. */
-} window_t;
+};
 
 /**