diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 02:01:04 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:13 -0500 |
commit | 452ddd94ba22bebe0fda5ee6a7ddceae2057fe40 (patch) | |
tree | f68b6554822c0d9aa1ceda711d2c28afa6aa9f4a /source4/include | |
parent | 26c6b4c70bd85d8030a96651f2a255a4d48fcda1 (diff) | |
download | samba-452ddd94ba22bebe0fda5ee6a7ddceae2057fe40.tar.gz samba-452ddd94ba22bebe0fda5ee6a7ddceae2057fe40.tar.bz2 samba-452ddd94ba22bebe0fda5ee6a7ddceae2057fe40.zip |
r3450: portability fixes
- fix rep_inet_ntoa() for IRIX
- lib/signal.c needs system/wait.h
- some systems define a macro "accept", which breaks the lib/socket/ structures.
use fn_ as a prefix for the structure elements to avoid the problem
(This used to be commit ced1a0fcdc8d8e47755ce4391c19f8b12862eb60)
Diffstat (limited to 'source4/include')
-rw-r--r-- | source4/include/includes.h | 4 | ||||
-rw-r--r-- | source4/include/system/network.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index a6a2354f67..c38c0acc8b 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -379,10 +379,6 @@ typedef int (*comparison_fn_t)(const void *, const void *); #define PASSWORD_LENGTH 8 #endif -#ifdef REPLACE_INET_NTOA -#define inet_ntoa rep_inet_ntoa -#endif - #ifndef HAVE_PIPE #define SYNC_DNS 1 #endif diff --git a/source4/include/system/network.h b/source4/include/system/network.h index fcee0f7c24..8b9fe0bcc5 100644 --- a/source4/include/system/network.h +++ b/source4/include/system/network.h @@ -58,3 +58,7 @@ #endif +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +#endif + |