Changeset b5e68c8 in mainline for uspace/lib/c/include/errno.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/lib/c/include/errno.h (modified) (2 diffs)

uspace/lib/c/include/errno.h

@@ -39 +39 @@
 #include <fibril.h>
 
-extern int _errno;
+#define errno  (*(__errno()))
 
-#define errno _errno
+extern int *__errno(void) __attribute__((const));
 
 #define EMFILE        (-18)
@@ -57 +57 @@
 
 /** An API function is called while another blocking function is in progress. */
-#define EINPROGRESS     (-10036)
+#define EINPROGRESS  (-10036)
 
 /** The socket identifier is not valid. */
-#define ENOTSOCK        (-10038)
+#define ENOTSOCK  (-10038)
 
 /** The destination address required. */
-#define EDESTADDRREQ    (-10039)
+#define EDESTADDRREQ  (-10039)
 
 /** Protocol is not supported.  */
-#define EPROTONOSUPPORT (-10043)
+#define EPROTONOSUPPORT  (-10043)
 
 /** Socket type is not supported. */
-#define ESOCKTNOSUPPORT (-10044)
+#define ESOCKTNOSUPPORT  (-10044)
 
 /** Protocol family is not supported. */
-#define EPFNOSUPPORT    (-10046)
+#define EPFNOSUPPORT  (-10046)
 
 /** Address family is not supported. */
-#define EAFNOSUPPORT    (-10047)
+#define EAFNOSUPPORT  (-10047)
 
 /** Address is already in use. */
-#define EADDRINUSE      (-10048)
+#define EADDRINUSE  (-10048)
 
 /** The socket is not connected or bound. */
-#define ENOTCONN        (-10057)
+#define ENOTCONN  (-10057)
 
-/** The requested operation was not performed.
- *  Try again later.
- */
-#define TRY_AGAIN       (-11002)
+/** The requested operation was not performed. Try again later. */
+#define EAGAIN  (-11002)
 
-/** No data.
- */
-#define NO_DATA         (-11004)
+/** No data. */
+#define NO_DATA (-11004)
 
 #endif