diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-08-24 18:53:37 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-08-24 18:53:37 +0000 |
| commit | 0e877bd53bcffcaeab738610ca64c685c99f8263 (patch) | |
| tree | c721a2a812a813150f33885ea058fe2aca1b1966 | |
| parent | 3f3f47b0bd8d089120d267cfad1976db95cd8ebe (diff) | |
| download | samba-0e877bd53bcffcaeab738610ca64c685c99f8263.tar.gz samba-0e877bd53bcffcaeab738610ca64c685c99f8263.tar.bz2 samba-0e877bd53bcffcaeab738610ca64c685c99f8263.zip | |
resource.h on FreeBSD 2.1 requires sys/time.h to come first.
(This used to be commit e94ab03a4f97ff7ee7bb938245cf054a00f950fd)
| -rw-r--r-- | source3/include/includes.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index a2419bc42c..5d050bf627 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -49,6 +49,17 @@ #include <sys/types.h> +#ifdef TIME_WITH_SYS_TIME +#include <sys/time.h> +#include <time.h> +#else +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#else +#include <time.h> +#endif +#endif + #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif @@ -88,17 +99,6 @@ #include <malloc.h> #endif -#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif - #ifdef HAVE_FCNTL_H #include <fcntl.h> #else |