svn commit: samba r3455 - in branches/SAMBA_4_0/source: include
include/system lib ntvfs/ipc ntvfs/posix smb_server
tridge at samba.org
tridge at samba.org
Tue Nov 2 03:44:52 GMT 2004
Author: tridge
Date: 2004-11-02 03:44:52 +0000 (Tue, 02 Nov 2004)
New Revision: 3455
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3455
Log:
some more portability fixes. We nearly compile on solaris again now.
Removed:
branches/SAMBA_4_0/source/include/system/resource.h
Modified:
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/include/system/filesys.h
branches/SAMBA_4_0/source/lib/replace.c
branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
branches/SAMBA_4_0/source/smb_server/conn.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/include/includes.h 2004-11-02 03:44:52 UTC (rev 3455)
@@ -172,14 +172,6 @@
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
Modified: branches/SAMBA_4_0/source/include/system/filesys.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/filesys.h 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/include/system/filesys.h 2004-11-02 03:44:52 UTC (rev 3455)
@@ -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
+
Deleted: branches/SAMBA_4_0/source/include/system/resource.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/resource.h 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/include/system/resource.h 2004-11-02 03:44:52 UTC (rev 3455)
@@ -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
-
Modified: branches/SAMBA_4_0/source/lib/replace.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace.c 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/lib/replace.c 2004-11-02 03:44:52 UTC (rev 3455)
@@ -21,6 +21,7 @@
#include "includes.h"
#include "system/wait.h"
#include "system/time.h"
+#include "system/network.h"
void replace_dummy(void);
void replace_dummy(void) {}
@@ -328,7 +329,7 @@
#ifndef WITH_PTHREADS
/* REWRITE: not thread safe */
#ifdef REPLACE_INET_NTOA
-char *rep_inet_ntoa(struct ipv4_addr ip)
+ char *rep_inet_ntoa(struct in_addr ip)
{
uint8_t *p = (uint8_t *)&ip.s_addr;
static char buf[18];
Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2004-11-02 03:44:52 UTC (rev 3455)
@@ -26,6 +26,7 @@
#include "includes.h"
+#include "system/filesys.h"
/* this is the private structure used to keep the state of an open
ipc$ connection. It needs to keep information about all open
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2004-11-02 03:44:52 UTC (rev 3455)
@@ -23,6 +23,7 @@
#include "include/includes.h"
#include "vfs_posix.h"
#include "system/time.h"
+#include "system/filesys.h"
/*
create file handles with convenient numbers for sniffers
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c 2004-11-02 03:44:52 UTC (rev 3455)
@@ -22,6 +22,7 @@
#include "include/includes.h"
#include "vfs_posix.h"
+#include "system/filesys.h"
/*
read from a file
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c 2004-11-02 03:44:52 UTC (rev 3455)
@@ -23,6 +23,7 @@
#include "include/includes.h"
#include "vfs_posix.h"
#include "system/time.h"
+#include "system/filesys.h"
/* the state of a search started with pvfs_search_first() */
Modified: branches/SAMBA_4_0/source/smb_server/conn.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/conn.c 2004-11-02 03:13:06 UTC (rev 3454)
+++ branches/SAMBA_4_0/source/smb_server/conn.c 2004-11-02 03:44:52 UTC (rev 3455)
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
/****************************************************************************
init the tcon structures
More information about the samba-cvs
mailing list