Changeset 432a269 in mainline for uspace/lib/posix/iso646.h

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/posix/iso646.h (moved) (moved from uspace/lib/imgmap/imgmap.h ) (2 diffs)

uspace/lib/posix/iso646.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2011 Jiri Zarevucky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup imgmap
+/** @addtogroup libposix
  * @{
  */
-/**
- * @file
+/** @file Alternative spellings.
  */
 
-#ifndef IMGMAP_IMGMAP_H_
-#define IMGMAP_IMGMAP_H_
+#ifndef POSIX_ISO646_H_
+#define POSIX_ISO646_H_
 
-#include <sys/types.h>
-#include <abi/fb/visuals.h>
+#define and &&
+#define and_eq &=
+#define bitand &
+#define bitor |
+#define compl ˜
+#define not !
+#define not_eq !=
+#define or ||
+#define or_eq |=
+#define xor ^
+#define xor_eq ^=
 
-typedef struct {
-        size_t size;
-        sysarg_t width;
-        sysarg_t height;
-        visual_t visual;
-        uint8_t data[];
-} imgmap_t;
-
-extern imgmap_t *imgmap_decode_tga(void *, size_t);
-
-#endif
+#endif /* POSIX_ISO646_H_ */
 
 /** @}