Changeset e48947e in mainline

Timestamp:

2017-05-12T20:28:59Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8d2dd7f2

Parents:

395df52 (diff), 02082f3 (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 fixes and improvements

Location:

uspace

Files:

• drv/bus/usb/ohci/hw_struct/hcca.h (modified) (2 diffs)
• lib/c/arch/abs32le/include/libarch/tls.h (modified) (1 diff)
• lib/c/arch/abs32le/src/entry.c (modified) (1 diff)
• lib/c/arch/abs32le/src/stacktrace.c (modified) (1 diff)
• lib/c/arch/abs32le/src/thread_entry.c (modified) (1 diff)
• lib/c/include/macros.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/hw_struct/hcca.h

@@ -40 +40 @@
 #include <sys/types.h>
 #include <macros.h>
+#include <assert.h>
 
 #include "mem_access.h"
@@ -60 +61 @@
 } hcca_t;
 
-STATIC_ASSERT(sizeof(hcca_t) == 256);
+static_assert(sizeof(hcca_t) == 256);
 
 /** Allocate properly aligned structure.

uspace/lib/c/arch/abs32le/include/libarch/tls.h

@@ -39 +39 @@
 
 #include <libc.h>
+#include <stddef.h>
 
 typedef struct {

uspace/lib/c/arch/abs32le/src/entry.c

@@ -32 +32 @@
 #include <libarch/entry.h>
 #include "../../../generic/private/libc.h"
+#include <stddef.h>
 
 void __entry(void)

uspace/lib/c/arch/abs32le/src/stacktrace.c

@@ -32 +32 @@
 #include <sys/types.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stacktrace.h>
 

uspace/lib/c/arch/abs32le/src/thread_entry.c

@@ -30 +30 @@
  */
 
+#include <stddef.h>
 #include "../../../generic/private/thread.h"
 

uspace/lib/c/include/macros.h

@@ -69 +69 @@
 #define PADD8 _padd(8, __LINE__)
 
-#define STATIC_ASSERT(cond) int sassert[(cond) ? 1 : -1]
-
 /** @}
  */