summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libc/inet/resolv.c1
-rw-r--r--libc/misc/fnmatch/fnmatch.c2
-rw-r--r--libc/misc/syslog/syslog.c2
-rw-r--r--libc/pwd_grp/lckpwdf.c3
-rw-r--r--libc/stdlib/abort.c2
-rw-r--r--libc/unistd/sleep.c5
-rw-r--r--libc/unistd/usleep.c2
7 files changed, 11 insertions, 6 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index ce849d03b..97ed3998f 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -145,6 +145,7 @@
#define inet_pton __inet_pton
#define inet_ntop __inet_ntop
#define connect __connect
+#define select __select
#define __FORCE_GLIBC
#include <features.h>
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 44f1431c8..e0d9daa87 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -117,7 +117,7 @@ int attribute_hidden __fnmatch(const char *pattern, const char *string, int flag
c1 = FOLD(c1);
for (--p; *n != '\0'; ++n)
if ((c == '[' || FOLD(*n) == c1) &&
- fnmatch(p, n, flags & ~FNM_PERIOD) == 0)
+ __fnmatch(p, n, flags & ~FNM_PERIOD) == 0)
return 0;
return FNM_NOMATCH;
}
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index 016db0864..3d0e9fb7b 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -32,7 +32,7 @@
*/
#define ctime __ctime
-#define sigaction __sigaction_internal
+#define sigaction __sigaction
#define connect __connect
#define __FORCE_GLIBC
diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c
index 2b3fa7596..9bba9b5fe 100644
--- a/libc/pwd_grp/lckpwdf.c
+++ b/libc/pwd_grp/lckpwdf.c
@@ -20,7 +20,8 @@
Boston, MA 02111-1307, USA. */
#define sigfillset __sigfillset_internal
-#define sigaction __sigaction_internal
+#define sigaction __sigaction
+#define alarm __alarm
#include <features.h>
#include <fcntl.h>
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index 83a052abe..f2ba16c7c 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -18,7 +18,7 @@ Cambridge, MA 02139, USA. */
/* Hacked up for uClibc by Erik Andersen */
-#define sigaction __sigaction_internal
+#define sigaction __sigaction
#define _GNU_SOURCE
#include <features.h>
diff --git a/libc/unistd/sleep.c b/libc/unistd/sleep.c
index 5d129bd81..03e43f43b 100644
--- a/libc/unistd/sleep.c
+++ b/libc/unistd/sleep.c
@@ -18,7 +18,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#define sigaction __sigaction_internal
+#define sigaction __sigaction
+#define nanosleep __nanosleep
#include <errno.h>
#include <time.h>
@@ -107,4 +108,4 @@ unsigned int attribute_hidden __sleep (unsigned int seconds)
return result;
}
#endif
-strong_alias(__sleep,sleep)
+weak_alias(__sleep,sleep)
diff --git a/libc/unistd/usleep.c b/libc/unistd/usleep.c
index 55e8f3fb7..db8b8710c 100644
--- a/libc/unistd/usleep.c
+++ b/libc/unistd/usleep.c
@@ -1,3 +1,5 @@
+#define nanosleep __nanosleep
+
#include <time.h>
#include <sys/time.h>
#include <sys/types.h>