Changeset 967

Timestamp:

Jan 11, 2004, 8:00:09 PM (22 years ago)

Author:

bird

Message:

Initial porting.

Location:

trunk/src/emx/src/lib/bsd

Files:

• db/hash/hash_bigkey.c (modified) (1 diff, 1 prop)
• db/hash/hash_buf.c (modified) (1 diff, 1 prop)
• db/hash/hash_func.c (modified) (1 diff, 1 prop)
• db/hash/hash_page.c (modified) (1 diff, 1 prop)
• db/hash/ndbm.c (modified) (1 diff, 1 prop)
• stdlib/hcreate.c (modified) (7 diffs, 1 prop)
• stdlib/insque.c (modified) (2 diffs, 1 prop)
• stdlib/lsearch.c (modified) (3 diffs, 1 prop)
• stdlib/remque.c (modified) (2 diffs, 1 prop)
• stdlib/tdelete.c (modified) (2 diffs, 1 prop)
• stdlib/tfind.c (modified) (2 diffs, 1 prop)
• stdlib/tsearch.c (modified) (2 diffs, 1 prop)
• stdlib/twalk.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/bsd/db/hash/hash_bigkey.c

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)hash_bigkey.c       8.3 (Berkeley) 5/31/94";

trunk/src/emx/src/lib/bsd/db/hash/hash_buf.c

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)hash_buf.c  8.5 (Berkeley) 7/15/94";

trunk/src/emx/src/lib/bsd/db/hash/hash_func.c

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94";

trunk/src/emx/src/lib/bsd/db/hash/hash_page.c

@@ -73 +73 @@
 
 #include <db.h>
+#ifndef __DBINTERFACE_PRIVATE
+#error "__DBINTERFACE_PRIVATE is not defined!"
+#endif
 #include "hash.h"
 #include "page.h"

trunk/src/emx/src/lib/bsd/db/hash/ndbm.c

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ndbm.c      8.4 (Berkeley) 7/21/94";

trunk/src/emx/src/lib/bsd/stdlib/hcreate.c

@@ -4 +4 @@
  * Copyright (c) 2001 Christopher G. Demetriou
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20 +20 @@
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31 +31 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
  */
@@ -47 +47 @@
  */
 
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 #if 0
@@ -89 +90 @@
 
 int
-hcreate(size_t nel)
+_STD(hcreate)(size_t nel)
 {
         size_t idx;
@@ -131 +132 @@
 
 void
-hdestroy(void)
+_STD(hdestroy)(void)
 {
         struct internal_entry *ie;
@@ -152 +153 @@
 
 ENTRY *
-hsearch(ENTRY item, ACTION action)
+_STD(hsearch)(ENTRY item, ACTION action)
 {
         struct internal_head *head;

trunk/src/emx/src/lib/bsd/stdlib/insque.c

@@ -5 +5 @@
  *
  * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
+ * unchanged, you can do what ever you want with this file.
  */
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdlib/insque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
@@ -19 +20 @@
 
 void
-insque(void *element, void *pred)
+_STD(insque)(void *element, void *pred)
 {
         struct que_elem *prev, *next, *elem;

trunk/src/emx/src/lib/bsd/stdlib/lsearch.c

@@ -5 +5 @@
  *
  * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
+ * unchanged, you can do what ever you want with this file.
  */
+#include "libc-alias.h"
 #include <sys/types.h>
 #include <sys/cdefs.h>
@@ -20 +21 @@
     int (*)(const void *, const void *), int);
 
-void *lsearch(const void *key, void *base, size_t *nelp, size_t width,
+void *_STD(lsearch)(const void *key, void *base, size_t *nelp, size_t width,
     int (*compar)(const void *, const void *))
 {
@@ -27 +28 @@
 }
 
-void *lfind(const void *key, const void *base, size_t *nelp, size_t width,
+void *_STD(lfind)(const void *key, const void *base, size_t *nelp, size_t width,
     int (*compar)(const void *, const void *))
 {

trunk/src/emx/src/lib/bsd/stdlib/remque.c

@@ -5 +5 @@
  *
  * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
+ * unchanged, you can do what ever you want with this file.
  */
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdlib/remque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
@@ -15 +16 @@
 
 void
-remque(void *element)
+_STD(remque)(void *element)
 {
         struct que_elem *prev, *next, *elem;

trunk/src/emx/src/lib/bsd/stdlib/tdelete.c

@@ -12 +12 @@
  */
 
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 #if 0
@@ -33 +34 @@
  */
 void *
-tdelete(const void * __restrict vkey, void ** __restrict vrootp,
+_STD(tdelete)(const void * __restrict vkey, void ** __restrict vrootp,
     int (*compar)(const void *, const void *))
 {

trunk/src/emx/src/lib/bsd/stdlib/tfind.c

@@ -12 +12 @@
  */
 
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 #if 0
@@ -26 +27 @@
 /* find a node, or return 0 */
 void *
-tfind(vkey, vrootp, compar)
+_STD(tfind)(vkey, vrootp, compar)
         const void *vkey;               /* key to be found */
         void * const *vrootp;           /* address of the tree root */

trunk/src/emx/src/lib/bsd/stdlib/tsearch.c

@@ -12 +12 @@
  */
 
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 #if 0
@@ -26 +27 @@
 /* find or insert datum into search tree */
 void *
-tsearch(vkey, vrootp, compar)
+_STD(tsearch)(vkey, vrootp, compar)
         const void *vkey;               /* key to be located */
         void **vrootp;                  /* address of tree root */

trunk/src/emx/src/lib/bsd/stdlib/twalk.c

@@ -12 +12 @@
  */
 
+#include "libc-alias.h"
 #include <sys/cdefs.h>
 #if 0
@@ -50 +51 @@
 /* Walk the nodes of a tree */
 void
-twalk(vroot, action)
+_STD(twalk)(vroot, action)
         const void *vroot;      /* Root of the tree to be walked */
         void (*action)(const void *, VISIT, int);