Commit 8b63b486 authored by Jonathan Nieder's avatar Jonathan Nieder Committed by Yang Tse
Browse files

headers: surround GCC attribute names with double underscores 

This protects from attribute names being defined by third party's code.

Improvement: http://curl.haxx.se/mail/lib-2012-04/0127.html
parent b9ac64c2

include/curl/typecheck-gcc.h

+4 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -141,8 +141,9 @@ __extension__ ({ \ 


/* To define a new warning, use _CURL_WARNING(identifier, "message") */

#define _CURL_WARNING(id, message)                                            \

  static void __attribute__((warning(message))) __attribute__((unused))       \

  __attribute__((noinline)) id(void) { __asm__(""); }

  static void __attribute__((__warning__(message)))                           \

  __attribute__((__unused__)) __attribute__((__noinline__))                   \

  id(void) { __asm__(""); }



_CURL_WARNING(_curl_easy_setopt_err_long,

  "curl_easy_setopt expects a long argument for this option")

lib/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ int netware_init(void); 
#ifndef __GNUC__

#define UNUSED_PARAM /*NOTHING*/

#else

#define UNUSED_PARAM __attribute__((unused))

#define UNUSED_PARAM __attribute__((__unused__))

#endif



/*

m4/curl-compilers.m4

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#***************************************************************************



# File version for 'aclocal' use. Keep it a single number.

# serial 59

# serial 60





dnl CURL_CHECK_COMPILER
@@ -1393,7 +1393,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ 
  case "$compiler_id" in

    CLANG)

      dnl All versions of clang support -fvisibility=

      tmp_EXTERN="__attribute__ ((visibility (\"default\")))"

      tmp_EXTERN="__attribute__ ((__visibility__ (\"default\")))"

      tmp_CFLAGS="-fvisibility=hidden"

      supports_symbol_hiding="yes"

      ;;
@@ -1401,7 +1401,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ 
      dnl Only gcc 3.4 or later

      if test "$compiler_num" -ge "304"; then

        if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null ; then

          tmp_EXTERN="__attribute__ ((visibility (\"default\")))"

          tmp_EXTERN="__attribute__ ((__visibility__ (\"default\")))"

          tmp_CFLAGS="-fvisibility=hidden"

          supports_symbol_hiding="yes"

        fi
@@ -1420,7 +1420,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ 
              printf("icc fvisibility bug test");

            ]])

          ],[

            tmp_EXTERN="__attribute__ ((visibility (\"default\")))"

            tmp_EXTERN="__attribute__ ((__visibility__ (\"default\")))"

            tmp_CFLAGS="-fvisibility=hidden"

            supports_symbol_hiding="yes"

          ])