Changeset 8ff0bd2 in mainline for uspace/lib/c/include/elf/elf.h

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/elf/elf.h (moved) (moved from uspace/srv/hid/adb_mouse/adb_dev.h ) (3 diffs)

uspace/lib/c/include/elf/elf.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
- * @brief
+/** @addtogroup generic
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef ADBDEV_H_
-#define ADBDEV_H_
+#ifndef LIBC_ELF_H_
+#define LIBC_ELF_H_
 
 #include <sys/types.h>
-
-extern int adb_dev_init(void);
+#include <abi/elf.h>
+#include <libarch/elf.h>
 
 #endif
 
-/**
- * @}
- */ 
-
+/** @}
+ */