diff options
| author | Christopher Faylor <me@cgf.cx> | 2007-06-17 04:31:27 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2007-06-17 04:31:27 +0400 |
| commit | 4a2c88cdc7274f5431cd6250cde1a62d39b7d62e (patch) | |
| tree | 73dd586c78f74e819a476d14467eef0442ed6157 | |
| parent | 438b07b09faf38375ce27396c9aa7e27c86f7f05 (diff) | |
* include/search.h: Reinstate node_t definition.
* include/sys/cdefs.h: Remove in favor of newlib version.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/include/search.h | 8 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/cdefs.h | 23 |
3 files changed, 16 insertions, 23 deletions
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 <me+cygwin@cgf.cx> + + * include/search.h: Reinstate node_t definition. + +2007-06-16 Christopher Faylor <me+cygwin@cgf.cx> + + * include/sys/cdefs.h: Remove in favor of newlib version. + 2007-06-14 Corinna Vinschen <corinna@vinschen.de> * 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 - |