From 4a2c88cdc7274f5431cd6250cde1a62d39b7d62e Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 17 Jun 2007 00:31:27 +0000 Subject: * include/search.h: Reinstate node_t definition. * include/sys/cdefs.h: Remove in favor of newlib version. --- winsup/cygwin/ChangeLog | 8 ++++++++ winsup/cygwin/include/search.h | 8 ++++++++ winsup/cygwin/include/sys/cdefs.h | 23 ----------------------- 3 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 winsup/cygwin/include/sys/cdefs.h (limited to 'winsup') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 11729f7ca..ac6e6f0c2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2007-06-16 Christopher Faylor + + * include/search.h: Reinstate node_t definition. + +2007-06-16 Christopher Faylor + + * include/sys/cdefs.h: Remove in favor of newlib version. + 2007-06-14 Corinna Vinschen * autoload.cc (GetIpForwardTable): Define. diff --git a/winsup/cygwin/include/search.h b/winsup/cygwin/include/search.h index 36a335ed9..f532eae55 100644 --- a/winsup/cygwin/include/search.h +++ b/winsup/cygwin/include/search.h @@ -31,6 +31,14 @@ typedef enum leaf } VISIT; +#ifdef _SEARCH_PRIVATE +typedef struct node +{ + char *key; + struct node *llink, *rlink; +} node_t; +#endif + struct hsearch_data { struct internal_head *htable; diff --git a/winsup/cygwin/include/sys/cdefs.h b/winsup/cygwin/include/sys/cdefs.h deleted file mode 100644 index c401ce794..000000000 --- a/winsup/cygwin/include/sys/cdefs.h +++ /dev/null @@ -1,23 +0,0 @@ -/* sys/cdefs.h - - Copyright 1998, 2000, 2001 Red Hat, Inc. - -This file is part of Cygwin. - -This software is a copyrighted work licensed under the terms of the -Cygwin license. Please consult the file "CYGWIN_LICENSE" for -details. */ - -#ifndef _SYS_CDEFS_H -#define _SYS_CDEFS_H -#ifdef __cplusplus -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#else -#define __BEGIN_DECLS -#define __END_DECLS -#endif -#define __P(protos) protos /* full-blown ANSI C */ -#define __CONCAT(__x,__y) __x##__y -#endif - -- cgit v1.2.3