diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-15 00:09:48 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-15 00:09:48 +0000 |
| commit | a97adaeb6f28498a536ec7e55636e0179bbac0a9 (patch) | |
| tree | ea260617ad6d2b2a01af4bbbe212f51e137b1b9a | |
| parent | 1b239a62112c9e0a84623b43fcce63006f61d7d7 (diff) | |
| download | ATCD-a97adaeb6f28498a536ec7e55636e0179bbac0a9.tar.gz | |
ChangeLogTag:Thu May 15 00:12:34 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/os_include/dirent.h | 5 | ||||
| -rw-r--r-- | ace/os_include/limits.h | 8 | ||||
| -rw-r--r-- | ace/os_include/netdb.h | 5 |
4 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 9b9e065a09a..13a3ce4fa67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu May 15 00:12:34 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/os_include/limits.h: + * ace/os_include/dirent.h: + * ace/os_include/netdb.h: + Moved MAXNAMLEN define from limits.h to dirent.h, and + MAXHOSTNAMELEN from limits.h to netdb.h to clear up + warnings on Solaris. + Wed May 14 17:40:28 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/OS.h: diff --git a/ace/os_include/dirent.h b/ace/os_include/dirent.h index 7f073b03418..87c214b6191 100644 --- a/ace/os_include/dirent.h +++ b/ace/os_include/dirent.h @@ -25,10 +25,15 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/sys/types.h" +#include "ace/os_include/limits.h" #if !defined (ACE_LACKS_DIRENT_H) # include /**/ <dirent.h> #endif /* !ACE_LACKS_DIRENT_H */ +#if !defined (MAXNAMLEN) +# define MAXNAMLEN NAME_MAX +#endif /* !MAXNAMLEN */ + #include "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_DIRENT_H */ diff --git a/ace/os_include/limits.h b/ace/os_include/limits.h index 4115e507ee7..4879c5bf6a3 100644 --- a/ace/os_include/limits.h +++ b/ace/os_include/limits.h @@ -52,10 +52,6 @@ # endif /* MAXNAMLEN */ #endif /* !NAME_MAX */ -#if !defined (MAXNAMLEN) -# define MAXNAMLEN NAME_MAX -#endif /* !MAXNAMLEN */ - #if !defined (MAXNAMELEN) # define MAXNAMELEN NAME_MAX #endif /* MAXNAMELEN */ @@ -64,10 +60,6 @@ # define HOST_NAME_MAX 256 #endif /* !HOST_NAME_MAX */ -# if !defined(MAXHOSTNAMELEN) -# define MAXHOSTNAMELEN HOST_NAME_MAX -# endif /* MAXHOSTNAMELEN */ - // Note that we are using PATH_MAX instead of _POSIX_PATH_MAX, since // _POSIX_PATH_MAX is the *minimun* maximum value for PATH_MAX and is // defined by POSIX as 256. diff --git a/ace/os_include/netdb.h b/ace/os_include/netdb.h index 9517b5fd077..53aab761498 100644 --- a/ace/os_include/netdb.h +++ b/ace/os_include/netdb.h @@ -25,6 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/netinet/in.h" +#include "ace/os_include/limits.h" #if !defined (ACE_LACKS_NETDB_H) # if defined (ACE_HAS_STL_QUEUE_CONFLICT) @@ -75,5 +76,9 @@ typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; #endif /* ACE_HAS_STRUCT_NETDB_DATA */ +# if !defined(MAXHOSTNAMELEN) +# define MAXHOSTNAMELEN HOST_NAME_MAX +# endif /* MAXHOSTNAMELEN */ + #include "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_NETDB_H */ |