projects
/
libusual.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ee987f
)
string: undef basename, dirname before defining
author
Marko Kreen
<markokr@gmail.com>
Sat, 11 Sep 2010 07:43:26 +0000
(10:43 +0300)
committer
Marko Kreen
<markokr@gmail.com>
Sat, 11 Sep 2010 08:30:47 +0000
(11:30 +0300)
Helps with testing, otherwise OS defs conflict with ours.
usual/string.h
patch
|
blob
|
blame
|
history
diff --git
a/usual/string.h
b/usual/string.h
index db9c8931a8c1cbe3665b444002ed5a905ca3101a..80f5f356238e5f15b11e76ceb14f519fad9a3f09 100644
(file)
--- a/
usual/string.h
+++ b/
usual/string.h
@@
-88,11
+88,13
@@
static inline int flsll(long long x) { _FLS(ll, long long); }
#ifndef HAVE_BASENAME
+#undef basename
#define basename(a) usual_basename(a)
const char *basename(const char *path);
#endif
#ifndef HAVE_DIRNAME
+#undef dirname
#define dirname(a) usual_dirname(a)
const char *dirname(const char *path);
#endif