Navigation

Changeset 1034:f4a73a991623 in freeDiameter


Ignore:
Timestamp:
Apr 17, 2013, 7:38:12 PM (11 years ago)
Author:
Sebastien Decugis <sdecugis@freediameter.net>
Branch:
default
Phase:
public
Message:

Fix warning on old GCC versions

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • extensions/app_diameap/diameap_tls.h

    r1033 r1034  
    4040#define DIAMEAP_TLS_H_
    4141
     42 #if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 405
     43# define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
     44# define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
     45# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
     46#  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \
     47     GCC_DIAG_PRAGMA(ignored x)
     48#  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop)
     49# else
     50#  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored x)
     51#  define GCC_DIAG_ON(x)  GCC_DIAG_PRAGMA(warning x)
     52# endif
     53#else
     54# define GCC_DIAG_OFF(x)
     55# define GCC_DIAG_ON(x)
     56#endif
     57
     58
    4259#include "diameap_defs.h"
    4360#include <gnutls/gnutls.h>
    44 #pragma GCC diagnostic push
    45 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     61GCC_DIAG_OFF("-Wdeprecated-declarations")
    4662#include <gcrypt.h>
    47 #pragma GCC diagnostic pop
     63GCC_DIAG_ON("-Wdeprecated-declarations")
    4864#include <errno.h>
    4965#include <pthread.h>

  • extensions/app_diameap/libcrypt.h

    r1033 r1034  
    4040#define LIBCRYPT_H_
    4141
    42 #pragma GCC diagnostic push
    43 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     42/* EAP-TLS*/
     43#include "diameap_tls.h"
     44
     45GCC_DIAG_OFF("-Wdeprecated-declarations")
    4446#include <gcrypt.h>
    45 #pragma GCC diagnostic pop
     47GCC_DIAG_ON("-Wdeprecated-declarations")
    4648#include <stdio.h>
    4749
    48 /* EAP-TLS*/
    49 #include "diameap_tls.h"
    5050
    5151

  • extensions/app_diameap/plugins/eap_md5/eap_md5.c

    r1033 r1034  
    3838
    3939#include "../../plugins.h"
    40 #pragma GCC diagnostic push
    41 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     40GCC_DIAG_OFF("-Wdeprecated-declarations")
    4241#include <gcrypt.h>
    43 #pragma GCC diagnostic pop
     42GCC_DIAG_ON("-Wdeprecated-declarations")
    4443
    4544#define CHALLENGE_LEN   16

  • extensions/app_sip/app_sip.h

    r1033 r1034  
    3939#include <stdlib.h>
    4040#include <stdio.h>
    41 #pragma GCC diagnostic push
    42 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     41GCC_DIAG_OFF("-Wdeprecated-declarations")
    4342#include <gcrypt.h>
    44 #pragma GCC diagnostic pop
     43GCC_DIAG_ON("-Wdeprecated-declarations")
    4544#include <string.h>
    4645#include <mysql.h>

  • extensions/test_sip/test_sip.h

    r1033 r1034  
    3939#include <stdlib.h>
    4040#include <stdio.h>
    41 #pragma GCC diagnostic push
    42 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     41GCC_DIAG_OFF("-Wdeprecated-declarations")
    4342#include <gcrypt.h>
    44 #pragma GCC diagnostic pop
     43GCC_DIAG_ON("-Wdeprecated-declarations")
    4544#include <string.h>
    4645#include <mysql.h>

  • include/freeDiameter/libfdproto.h

    r1033 r1034  
    8989#define _ATTRIBUTE_PRINTFLIKE_(_f,_v) __attribute__ ((format (printf, _f, _v)))
    9090#endif /* SWIG */
     91
     92/* Remove some deprecated warnings from some gnutls versions, when possible */
     93#if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 405
     94# define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
     95# define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
     96# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
     97#  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \
     98     GCC_DIAG_PRAGMA(ignored x)
     99#  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop)
     100# else
     101#  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored x)
     102#  define GCC_DIAG_ON(x)  GCC_DIAG_PRAGMA(warning x)
     103# endif
     104#else
     105# define GCC_DIAG_OFF(x)
     106# define GCC_DIAG_ON(x)
     107#endif
    91108
    92109/*============================================================*/

  • libfdcore/config.c

    r1033 r1034  
    227227
    228228#ifndef GNUTLS_VERSION_300
    229 # pragma GCC diagnostic push
    230 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     229GCC_DIAG_OFF("-Wdeprecated-declarations")
    231230#endif /* !GNUTLS_VERSION_300 */
    232231/* Parse the configuration file (using the yacc parser) */
    … …  
    600599}
    601600#ifndef GNUTLS_VERSION_300
    602 # pragma GCC diagnostic pop
     601GCC_DIAG_ON("-Wdeprecated-declarations")
    603602#endif /* !GNUTLS_VERSION_300 */
    604603

  • libfdcore/core.c

    r1033 r1034  
    3636#include "fdcore-internal.h"
    3737
    38 #pragma GCC diagnostic push
    39 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     38GCC_DIAG_OFF("-Wdeprecated-declarations")
    4039#include <gcrypt.h>
    41 #pragma GCC diagnostic pop
     40GCC_DIAG_ON("-Wdeprecated-declarations")
    4241
    4342/* The static configuration structure */

  • libfdcore/sctps.c

    r1033 r1034  
    231231/* Set the parameters of a session to use the appropriate fifo and stream information */
    232232#ifndef GNUTLS_VERSION_300
    233 # pragma GCC diagnostic push
    234 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     233GCC_DIAG_OFF("-Wdeprecated-declarations")
    235234#endif /* !GNUTLS_VERSION_300 */
    236235static void set_sess_transport(gnutls_session_t session, struct sctps_ctx *ctx)
    … …  
    252251}
    253252#ifndef GNUTLS_VERSION_300
    254 # pragma GCC diagnostic pop
     253GCC_DIAG_ON("-Wdeprecated-declarations")
    255254#endif /* !GNUTLS_VERSION_300 */
    256255

  • tests/tests.h

    r1033 r1034  
    4747#include <pthread.h>
    4848#include <errno.h>
    49 #pragma GCC diagnostic push
    50 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     49GCC_DIAG_OFF("-Wdeprecated-declarations")
    5150#include <gcrypt.h>
    52 #pragma GCC diagnostic pop
     51GCC_DIAG_ON("-Wdeprecated-declarations")
    5352
    5453/* Test timeout duration, unless -n is passed on the command line */
Note: See TracChangeset for help on using the changeset viewer.