Attachment 8414 Details for Bug 9548 – Patch for master

[patch] Patch for master

9548-master.patch (text/plain), 2.76 KB, created by Volker Lendecke on 2013-01-12 17:45:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2013-01-12 17:45:44 UTC

Size: 2.76 KB

patch

obsolete

>From 52cb5449846319eb3efae6ae8e9ade337a3ff5c6 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Sat, 12 Jan 2013 16:08:07 +0100
>Subject: [PATCH] Fix bug 9548: Correctly detect O_DIRECT
>
>---
> lib/replace/libreplace.m4 | 21 ++++++++++-----------
> lib/replace/wscript       | 11 +++++++++++
> 2 Dateien geÃ¤ndert, 21 Zeilen hinzugefÃ¼gt(+), 11 Zeilen entfernt(-)
>
>diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
>index ac2af27..5a41844 100644
>--- a/lib/replace/libreplace.m4
>+++ b/lib/replace/libreplace.m4
>@@ -357,6 +357,16 @@ if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
> fi
> 
> 
>+dnl Check if the C compiler understands volatile (it should, being ANSI).
>+AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [
>+	AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0],
>+		libreplace_cv_volatile=yes,libreplace_cv_volatile=no)])
>+if test x"$libreplace_cv_volatile" = x"yes"; then
>+	AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
>+fi
>+
>+m4_include(system/config.m4)
>+
> AC_CACHE_CHECK([for O_DIRECT flag to open(2)],libreplace_cv_HAVE_OPEN_O_DIRECT,[
> AC_TRY_COMPILE([
> #include <unistd.h>
>@@ -369,17 +379,6 @@ if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
>     AC_DEFINE(HAVE_OPEN_O_DIRECT,1,[Whether the open(2) accepts O_DIRECT])
> fi
> 
>-
>-dnl Check if the C compiler understands volatile (it should, being ANSI).
>-AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [
>-	AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0],
>-		libreplace_cv_volatile=yes,libreplace_cv_volatile=no)])
>-if test x"$libreplace_cv_volatile" = x"yes"; then
>-	AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
>-fi
>-
>-m4_include(system/config.m4)
>-
> m4_include(dlfcn.m4)
> m4_include(strptime.m4)
> m4_include(win32.m4)
>diff --git a/lib/replace/wscript b/lib/replace/wscript
>index 296dae9..674b99d 100644
>--- a/lib/replace/wscript
>+++ b/lib/replace/wscript
>@@ -106,6 +106,17 @@ struct foo bar = { .y = 'X', .x = 1 };
>     conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h')
>     conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h')
> 
>+    conf.CHECK_CODE('''
>+                    #include <unistd.h>
>+                    #ifdef HAVE_FCNTL_H
>+                    #include <fcntl.h>
>+                    #endif
>+                    int main(void) { int fd = open("/dev/null", O_DIRECT); }
>+                    ''',
>+                    define='HAVE_OPEN_O_DIRECT',
>+                    addmain=False,
>+                    msg='Checking for O_DIRECT flag to open(2)')
>+
>     conf.CHECK_TYPES('"long long" intptr_t uintptr_t ptrdiff_t comparison_fn_t')
>     conf.CHECK_TYPE('_Bool', define='HAVE__Bool')
>     conf.CHECK_TYPE('bool', define='HAVE_BOOL')
>-- 
>1.7.11.5
>

Flags:

jra: review+

Actions: View

Attachments on bug 9548: 8413 | 8414