svn commit: samba r3446 - in branches/SAMBA_4_0/source: include include/system lib torture torture/local

tridge at samba.org tridge at samba.org
Mon Nov 1 23:45:42 GMT 2004


Author: tridge
Date: 2004-11-01 23:45:40 +0000 (Mon, 01 Nov 2004)
New Revision: 3446

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3446

Log:
created include/system/iconv.h and include/system/shmem.h

Added:
   branches/SAMBA_4_0/source/include/system/iconv.h
   branches/SAMBA_4_0/source/include/system/shmem.h
Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/iconv.c
   branches/SAMBA_4_0/source/torture/local/iconv.c
   branches/SAMBA_4_0/source/torture/torture_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2004-11-01 23:37:12 UTC (rev 3445)
+++ branches/SAMBA_4_0/source/include/includes.h	2004-11-01 23:45:40 UTC (rev 3446)
@@ -317,23 +317,6 @@
 
 #endif
 
-#if defined(HAVE_SYS_IPC_H)
-#include <sys/ipc.h>
-#endif /* HAVE_SYS_IPC_H */
-
-#if defined(HAVE_SYS_SHM_H)
-#include <sys/shm.h>
-#endif /* HAVE_SYS_SHM_H */
-
-#ifdef HAVE_NATIVE_ICONV
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-#ifdef HAVE_GICONV
-#include <giconv.h>
-#endif
-#endif
-
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS

Added: branches/SAMBA_4_0/source/include/system/iconv.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/iconv.h	2004-11-01 23:37:12 UTC (rev 3445)
+++ branches/SAMBA_4_0/source/include/system/iconv.h	2004-11-01 23:45:40 UTC (rev 3446)
@@ -0,0 +1,31 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   iconv memory 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_NATIVE_ICONV
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+#ifdef HAVE_GICONV
+#include <giconv.h>
+#endif
+#endif
+

Added: branches/SAMBA_4_0/source/include/system/shmem.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/shmem.h	2004-11-01 23:37:12 UTC (rev 3445)
+++ branches/SAMBA_4_0/source/include/system/shmem.h	2004-11-01 23:45:40 UTC (rev 3446)
@@ -0,0 +1,39 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   shared memory 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.
+*/
+
+#if defined(HAVE_SYS_IPC_H)
+#include <sys/ipc.h>
+#endif /* HAVE_SYS_IPC_H */
+
+#if defined(HAVE_SYS_SHM_H)
+#include <sys/shm.h>
+#endif /* HAVE_SYS_SHM_H */
+
+/* NetBSD doesn't have these */
+#ifndef SHM_R
+#define SHM_R 0400
+#endif
+
+#ifndef SHM_W
+#define SHM_W 0200
+#endif
+

Modified: branches/SAMBA_4_0/source/lib/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/iconv.c	2004-11-01 23:37:12 UTC (rev 3445)
+++ branches/SAMBA_4_0/source/lib/iconv.c	2004-11-01 23:45:40 UTC (rev 3446)
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 
 /**

Modified: branches/SAMBA_4_0/source/torture/local/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/iconv.c	2004-11-01 23:37:12 UTC (rev 3445)
+++ branches/SAMBA_4_0/source/torture/local/iconv.c	2004-11-01 23:45:40 UTC (rev 3446)
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 #if HAVE_NATIVE_ICONV
 /*

Modified: branches/SAMBA_4_0/source/torture/torture_util.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture_util.c	2004-11-01 23:37:12 UTC (rev 3445)
+++ branches/SAMBA_4_0/source/torture/torture_util.c	2004-11-01 23:45:40 UTC (rev 3446)
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "system/shmem.h"
 
 
 static struct timeval tp1,tp2;
@@ -167,15 +168,6 @@
 	int shmid;
 	void *ret;
 
-/* NetBSD doesn't have these */
-#ifndef SHM_R
-#define SHM_R 0400
-#endif
-
-#ifndef SHM_W
-#define SHM_W 0200
-#endif
-
 	shmid = shmget(IPC_PRIVATE, size, SHM_R | SHM_W);
 	if (shmid == -1) {
 		printf("can't get shared memory\n");



More information about the samba-cvs mailing list