diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 03:34:59 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 03:34:59 +0400 |
| commit | c7f9080bef3a928ec8782735882adc3be7463226 (patch) | |
| tree | 3623987e832a7c470c16bb8ea852b642c7013481 /streams | |
| parent | 415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da (diff) | |
| download | glibc-c7f9080bef3a928ec8782735882adc3be7463226.tar.gz | |
Manually merged the rest of kopensolaris changes.
Except of two files which where removed (?)
For now I kept them: ./nptl_db/proc_service.h ./nptl_db/thread_db.h
Diffstat (limited to 'streams')
| -rw-r--r-- | streams/stropts.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/streams/stropts.h b/streams/stropts.h index fa67fef400..bf5e59d841 100644 --- a/streams/stropts.h +++ b/streams/stropts.h @@ -33,7 +33,10 @@ typedef __uid_t uid_t; #endif typedef __t_scalar_t t_scalar_t; +#ifndef __t_uscalar_t_defined typedef __t_uscalar_t t_uscalar_t; +# define __t_uscalar_t_defined +#endif /* Get system specific contants. */ #include <bits/stropts.h> |