diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 03:44:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:15 -0500 |
| commit | f4ec1497a1047eab8a2077694c7629ca6bb9eaa4 (patch) | |
| tree | 048961f22f64b0166a7d18483134c64ce9023e5b /source4/include | |
| parent | 6148deca663f7b6504b044120b166d6c9ae28750 (diff) | |
| download | samba-f4ec1497a1047eab8a2077694c7629ca6bb9eaa4.tar.gz samba-f4ec1497a1047eab8a2077694c7629ca6bb9eaa4.tar.bz2 samba-f4ec1497a1047eab8a2077694c7629ca6bb9eaa4.zip | |
r3455: some more portability fixes. We nearly compile on solaris again now.
(This used to be commit 4f33247f1ca60416415a61a7afac43c9dc8a61fd)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/includes.h | 8 | ||||
| -rw-r--r-- | source4/include/system/filesys.h | 19 | ||||
| -rw-r--r-- | source4/include/system/resource.h | 35 |
3 files changed, 19 insertions, 43 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index c511a5fb33..ce8f81c539 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -172,14 +172,6 @@ struct ipv4_addr { uint32_t s_addr; }; -#ifndef UINT8_MAX -#define UINT8_MAX 255 -#endif - -#ifndef UINT16_MAX -#define UINT16_MAX 65535 -#endif - #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h index 1ddb6b687c..07465c1c56 100644 --- a/source4/include/system/filesys.h +++ b/source4/include/system/filesys.h @@ -104,6 +104,20 @@ #include <dlfcn.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif + + +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + +#ifdef HAVE_LIMITS_H +#include <limits.h> +#endif + + #ifndef RTLD_LAZY #define RTLD_LAZY 0 #endif @@ -161,3 +175,8 @@ #ifndef HAVE_RENAME int rename(const char *zfrom, const char *zto); #endif + +#ifndef UINT16_MAX +#define UINT16_MAX 65535 +#endif + diff --git a/source4/include/system/resource.h b/source4/include/system/resource.h deleted file mode 100644 index e95448e5b7..0000000000 --- a/source4/include/system/resource.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - resource system include wrappers - - Copyright (C) Andrew Tridgell 2004 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifdef HAVE_SYS_RESOURCE_H -#include <sys/resource.h> -#endif - - -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif - -#ifdef HAVE_LIMITS_H -#include <limits.h> -#endif - |