Changeset db71e2a in mainline for uspace/lib/posix/include/posix/fnmatch.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/lib/posix/include/posix/fnmatch.h (modified) (2 diffs)

uspace/lib/posix/include/posix/fnmatch.h

@@ -36 +36 @@
 #define POSIX_FNMATCH_H_
 
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
 /* Error Values */
 #undef FNM_NOMATCH
@@ -56 +60 @@
 #define FNM_CASEFOLD 16
 
-extern int posix_fnmatch(const char *pattern, const char *string, int flags);
+extern int __POSIX_DEF__(fnmatch)(const char *pattern, const char *string, int flags);
 
-#ifndef LIBPOSIX_INTERNAL
-        #define fnmatch posix_fnmatch
-#endif
 
 #endif /* POSIX_FNMATCH_H_ */