sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

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

Browse Source
This commit is contained in:
Andrew Tridgell 2004-11-01 23:45:40 +00:00 committed by Gerald (Jerry) Carter
parent 8ebd20cf55
commit 70055fb1f4
6 changed files with 73 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/include/includes.h
View File

@ -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

31
source/include/system/iconv.h Normal file
View File

@ -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

39
source/include/system/shmem.h Normal file
View File

@ -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

1
source/lib/iconv.c
View File

@ -20,6 +20,7 @@
*/
#include "includes.h"
#include "system/iconv.h"
/**

1
source/torture/local/iconv.c
View File

@ -22,6 +22,7 @@
*/
#include "includes.h"
#include "system/iconv.h"
#if HAVE_NATIVE_ICONV
/*

10
source/torture/torture_util.c
View File

@ -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 @@ void *shm_setup(int size)
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");