Changeset 0dc2fec in mainline for uspace/lib/posix/source/fnmatch.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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/source/fnmatch.c (modified) (1 diff)

uspace/lib/posix/source/fnmatch.c

@@ -640 +640 @@
         #define nomatch(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == FNM_NOMATCH)
 
-        assert(FNM_PATHNAME == FNM_FILE_NAME);
+        static_assert(FNM_PATHNAME == FNM_FILE_NAME);
         match("", "", 0);
         match("*", "hello", 0);