lkml.org 
[lkml]   [2009]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] perf tools: Prevent from BITS_PER_LONG redefinition
    Date
    The system asm/types.h may have defined BITS_PER_LONG already,
    depending on the distro.

    Check that before defining it from bitops.h wrapper.

    Fixes:

    In file included from util/include/../../../../include/linux/bitops.h:17,
    from util/include/linux/bitops.h:8,
    from ../../lib/hweight.c:2:
    util/include/asm/bitops.h:9:1: error: "BITS_PER_LONG" redefined
    In file included from util/include/../../../../include/linux/bitops.h:3,
    from util/include/linux/bitops.h:8,
    from ../../lib/hweight.c:2:
    /usr/include/asm/types.h:32:1: error: this is the location of the previous definition
    make: *** [util/hweight.o] Erreur 1

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    ---
    tools/perf/util/include/asm/bitops.h | 2 ++
    1 files changed, 2 insertions(+), 0 deletions(-)

    diff --git a/tools/perf/util/include/asm/bitops.h b/tools/perf/util/include/asm/bitops.h
    index 58e9817..d945334 100644
    --- a/tools/perf/util/include/asm/bitops.h
    +++ b/tools/perf/util/include/asm/bitops.h
    @@ -5,8 +5,10 @@
    #include "../../types.h"
    #include <linux/compiler.h>

    +#ifndef BITS_PER_LONG
    /* CHECKME: Not sure both always match */
    #define BITS_PER_LONG __WORDSIZE
    +#endif

    #include "../../../../include/asm-generic/bitops/__fls.h"
    #include "../../../../include/asm-generic/bitops/fls.h"
    --
    1.6.2.3


    \
     
     \ /
      Last update: 2009-12-18 23:07    [W:0.020 / U:31.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site