about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/string.h2
-rw-r--r--include/sys/param.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/string.h b/include/string.h
index 4aa930ed..8cf0ee9d 100644
--- a/include/string.h
+++ b/include/string.h
@@ -85,8 +85,10 @@ char *strcasestr(const char *, const char *);
 char *strsep(char **, const char *);
 void *memrchr(const void *, int, size_t);
 void *mempcpy(void *, const void *, size_t);
+#ifndef __cplusplus
 char *basename();
 #endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/include/sys/param.h b/include/sys/param.h
index 1650e772..344c0d23 100644
--- a/include/sys/param.h
+++ b/include/sys/param.h
@@ -18,7 +18,7 @@
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define MAX(a,b) (((a)>(b))?(a):(b))
 
-#define ___bitop(x,i,o) ((a)[(i)/8] o 1<<(i)%8)
+#define __bitop(x,i,o) ((x)[(i)/8] o (1<<(i)%8))
 #define setbit(x,i) __bitop(x,i,|=)
 #define clrbit(x,i) __bitop(x,i,&=~)
 #define isset(x,i) __bitop(x,i,&)