diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 22:00:25 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 22:00:25 +0000 |
| commit | 650b1bd591a011245a7e22e52d86d75ffdb7019b (patch) | |
| tree | eca13addce6382a94541f94f869a12b8078e6472 | |
| parent | eb5b01a6613da374b2a1a365d83e329ef2741a46 (diff) | |
| download | ATCD-650b1bd591a011245a7e22e52d86d75ffdb7019b.tar.gz | |
ChangeLogTag:Wed Feb 4 21:55:38 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ace/config-lynxos.h | 6 | ||||
| -rw-r--r-- | ace/os_include/os_stdlib.h | 4 | ||||
| -rw-r--r-- | ace/os_include/os_unistd.h | 5 |
4 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index b4b07211fd9..e2e24fa9b88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Wed Feb 4 21:55:38 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu> + + * ace/config-lynxos.h: + * ace/os_include/os_stdlib.h: + * ace/os_include/os_unistd.h: + Moved the prototypes for getopt() and putenv() out of + config-lynxos.h and into the appropriate os_include header. + Added prototype of swab() to os_unistd.h. Thanks to Olli Savia + <ops@iki.fi> for the patch. + Wed Feb 4 14:21:46 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * bin/MakeProjectCreator/config/ciao_client.mpb: diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index 96dc7e55064..6ab83a4d87a 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -196,12 +196,6 @@ // System include files are not in sys/, this gets rid of warning. #define __NO_INCLUDE_WARN__ -extern "C" -{ - int getopt (int, char *const *, const char *); - int putenv (const char *); -} - #if _POSIX_VERSION >= 199009L // The following are patches for LynxOS 4.0.0, which we'll add as soon // as we know the right incantations to avoid breaking earlier diff --git a/ace/os_include/os_stdlib.h b/ace/os_include/os_stdlib.h index d1e4b41dcd0..6a61add5c3c 100644 --- a/ace/os_include/os_stdlib.h +++ b/ace/os_include/os_stdlib.h @@ -77,6 +77,10 @@ extern "C" extern int _Prand_r (unsigned int *seedptr); #endif /* DIGITAL_UNIX */ +#if defined (__Lynx__) + int putenv (char *); +#endif /* __Lynx__ */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h index e8a8e69407b..cc80f3ddc61 100644 --- a/ace/os_include/os_unistd.h +++ b/ace/os_include/os_unistd.h @@ -180,6 +180,11 @@ extern "C" # endif /* ACE_LACKS_TIMEDWAIT_PROTOTYPES */ +#if defined (__Lynx__) + void swab(const void *, void *, ssize_t); + int getopt(int, char * const [], const char *); +#endif /* __Lynx__ */ + #ifdef __cplusplus } #endif /* __cplusplus */ |