Navigation

Changeset 1034:f4a73a991623 in freeDiameter for extensions


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

Location:
extensions
Files:
5 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>
Note: See TracChangeset for help on using the changeset viewer.