From 4a1ac217f4499f154e01c1f6e8aceb9ac6adeae7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 10 Jan 2007 18:23:06 +0000 Subject: r20659: add missing system/aio.h tridge: please commit your version and merge it to both samba3 branches metze (This used to be commit ba492e2c3a64dfc5d4743ba568c63cb9a59e2849) --- source4/lib/replace/system/aio.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 source4/lib/replace/system/aio.h (limited to 'source4/lib/replace/system/aio.h') diff --git a/source4/lib/replace/system/aio.h b/source4/lib/replace/system/aio.h new file mode 100644 index 0000000000..102ed5ceb1 --- /dev/null +++ b/source4/lib/replace/system/aio.h @@ -0,0 +1,29 @@ +#ifndef _system_aio_h +#define _system_aoi_h +/* + Unix SMB/CIFS implementation. + + async io include wrappers + + Copyright (C) Stefan Metzmacher 2006 + + 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_LIBAIO_H 1 +#include +#endif + +#endif -- cgit From 4056528f7268daee5b8fdec0e9b9b6fb19fb72e8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 10 Jan 2007 20:07:13 +0000 Subject: r20665: put in my version of aio.h sorry about that .... (This used to be commit a91373291422e2f50b91fd7c2317dce5d2a4ab63) --- source4/lib/replace/system/aio.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/lib/replace/system/aio.h') diff --git a/source4/lib/replace/system/aio.h b/source4/lib/replace/system/aio.h index 102ed5ceb1..e1b9d836e7 100644 --- a/source4/lib/replace/system/aio.h +++ b/source4/lib/replace/system/aio.h @@ -1,11 +1,11 @@ #ifndef _system_aio_h -#define _system_aoi_h +#define _system_aio_h /* Unix SMB/CIFS implementation. - async io include wrappers + AIO system include wrappers - Copyright (C) Stefan Metzmacher 2006 + Copyright (C) Andrew Tridgell 2006 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 @@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_LIBAIO_H 1 +#if HAVE_LIBAIO_H #include #endif -- cgit From 0ce02a2c0eb322502bd931e83fa23ce476198e06 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 15 Jan 2007 19:27:45 +0000 Subject: r20819: - include system/aio.h - use full prototype for main - use ifdef instead if metze (This used to be commit b3a3c44f42455d6f84ab2f1f282fb177f8b6013c) --- source4/lib/replace/system/aio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/replace/system/aio.h') diff --git a/source4/lib/replace/system/aio.h b/source4/lib/replace/system/aio.h index e1b9d836e7..45154ccb27 100644 --- a/source4/lib/replace/system/aio.h +++ b/source4/lib/replace/system/aio.h @@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if HAVE_LIBAIO_H +#ifdef HAVE_LIBAIO_H #include #endif -- cgit From c3b00b471aaa4a0da7f2743ae2170a36bb11a16f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 May 2007 15:53:59 +0000 Subject: r22827: Change license to LGPL (discussed with tridge). (This used to be commit 1193c759622edd9e6843d9b7f53d9532748ce8a0) --- source4/lib/replace/system/aio.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'source4/lib/replace/system/aio.h') diff --git a/source4/lib/replace/system/aio.h b/source4/lib/replace/system/aio.h index 45154ccb27..624575f619 100644 --- a/source4/lib/replace/system/aio.h +++ b/source4/lib/replace/system/aio.h @@ -7,19 +7,23 @@ Copyright (C) Andrew Tridgell 2006 - 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. + ** NOTE! The following LGPL license applies to the replace + ** library. This does NOT imply that all of Samba is released + ** under the LGPL - This program is distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_LIBAIO_H -- cgit From b8d69a7ea2505b706ff7c74d7c97bc89d82dfa07 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:46:15 +0000 Subject: r23795: more v2->v3 conversion (This used to be commit 84b468b2f8f2dffda89593f816e8bc6a8b6d42ac) --- source4/lib/replace/system/aio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/replace/system/aio.h') diff --git a/source4/lib/replace/system/aio.h b/source4/lib/replace/system/aio.h index 624575f619..8bc4fdfd42 100644 --- a/source4/lib/replace/system/aio.h +++ b/source4/lib/replace/system/aio.h @@ -14,7 +14,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit From 6c973f4e8ccbcb6c9275f8a54e26abb19df7e15a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 03:42:26 +0000 Subject: r23798: updated old Temple Place FSF addresses to new URL (This used to be commit 40c0919aaa9c1b14bbaebb95ecce53eb0380fdbb) --- source4/lib/replace/system/aio.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/lib/replace/system/aio.h') diff --git a/source4/lib/replace/system/aio.h b/source4/lib/replace/system/aio.h index 8bc4fdfd42..784d77fa28 100644 --- a/source4/lib/replace/system/aio.h +++ b/source4/lib/replace/system/aio.h @@ -22,8 +22,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; if not, see . */ #ifdef HAVE_LIBAIO_H -- cgit