Changeset f9d0a86 in mainline for abi/include/_bits/wint_t.h

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• abi/include/_bits/wint_t.h (moved) (moved from uspace/lib/c/arch/arm32/include/libarch/stddef.h ) (3 diffs)

abi/include/_bits/wint_t.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcarm32
+/* Authors:
+ *      Jiří Zárevúcky (jzr) <zarevucky.jiri@gmail.com>
+ */
+
+/** @addtogroup bits
  * @{
  */
@@ -33 +37 @@
  */
 
-#ifndef LIBC_arm32_STDDEF_H_
-#define LIBC_arm32_STDDEF_H_
+#ifndef _BITS_WINT_T_H_
+#define _BITS_WINT_T_H_
 
-#include <libarch/common.h>
+#include <_bits/macros.h>
 
-typedef uint32_t size_t;
-typedef int32_t ssize_t;
-typedef int32_t ptrdiff_t;
+typedef __WINT_TYPE__ wint_t;
 
 #endif