From e433ede08ba069f5100737e22eb8627187ae8f92 Mon Sep 17 00:00:00 2001
From: Bernd Schmidt <bernds_cb1@t-online.de>
Date: Thu, 12 Jun 2008 10:31:17 +0000
Subject: Revert revision 19347, plus libc_hidden_proto for __uc_malloc. Some
 of the code is functionally identical before and after, but for now I'm just
 mechanically reverting the entire mess.

---
 libc/inet/getservice.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libc/inet/getservice.c')

diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index c8ee77559..bb1d6d2e4 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -59,7 +59,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
@@ -73,7 +72,6 @@ libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
 libc_hidden_proto(abort)
-libc_hidden_proto(__uc_malloc)
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -92,7 +90,9 @@ static smallint serv_stayopen;
 static void __initbuf(void)
 {
     if (!servbuf) {
-	servbuf = __uc_malloc(SBUFSIZE);
+	servbuf = malloc(SBUFSIZE);
+	if (!servbuf)
+	    abort();
     }
 }
 
-- 
cgit v1.2.3