Skip to content

Commit 277bcb7

Browse files
nobumatzbot
authored andcommitted
[ruby/digest] Move macros for warnings to defs.h
ruby/digest@70a805b872
1 parent ba6a36e commit 277bcb7

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

ext/digest/defs.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,26 @@
1616
# define __END_DECLS
1717
#endif
1818

19+
#define RB_DIGEST_DIAGNOSTIC(compiler, op, flag) _Pragma(STRINGIZE(compiler diagnostic op flag))
20+
#ifdef RBIMPL_WARNING_IGNORED
21+
# define RB_DIGEST_WARNING_IGNORED(flag) RBIMPL_WARNING_IGNORED(flag)
22+
# define RB_DIGEST_WARNING_PUSH() RBIMPL_WARNING_PUSH()
23+
# define RB_DIGEST_WARNING_POP() RBIMPL_WARNING_POP()
24+
#elif defined(__clang__)
25+
# define RB_DIGEST_WARNING_IGNORED(flag) RB_DIGEST_DIAGNOSTIC(clang, ignored, #flag)
26+
# define RB_DIGEST_WARNING_PUSH() _Pragma("clang diagnostic push")
27+
# define RB_DIGEST_WARNING_POP() _Pragma("clang diagnostic pop")
28+
#else /* __GNUC__ */
29+
# define RB_DIGEST_WARNING_IGNORED(flag) RB_DIGEST_DIAGNOSTIC(GCC, ignored, #flag)
30+
# define RB_DIGEST_WARNING_PUSH() _Pragma("GCC diagnostic push")
31+
# define RB_DIGEST_WARNING_POP() _Pragma("GCC diagnostic pop")
32+
#endif
33+
#ifdef RBIMPL_HAS_WARNING
34+
# define RB_DIGEST_HAS_WARNING(_) RBIMPL_HAS_WARNING(_)
35+
#elif defined(__has_warning)
36+
# define RB_DIGEST_HAS_WARNING(_) __has_warning(_)
37+
#else
38+
# define RB_DIGEST_HAS_WARNING(_) 0
39+
#endif
40+
1941
#endif /* DEFS_H */

ext/digest/md5/md5cc.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
#include <CommonCrypto/CommonDigest.h>
33

44
#ifdef __GNUC__
5-
# define RB_DIGEST_DIAGNOSTIC(compiler, op, flag) _Pragma(STRINGIZE(compiler diagnostic op flag))
6-
# ifdef RBIMPL_WARNING_IGNORED
7-
# define RB_DIGEST_WARNING_IGNORED(flag) RBIMPL_WARNING_IGNORED(flag)
8-
# elif defined(__clang__)
9-
# define RB_DIGEST_WARNING_IGNORED(flag) RB_DIGEST_DIAGNOSTIC(clang, ignored, #flag)
10-
# else /* __GNUC__ */
11-
# define RB_DIGEST_WARNING_IGNORED(flag) RB_DIGEST_DIAGNOSTIC(GCC, ignored, #flag)
12-
# endif
135
RB_DIGEST_WARNING_IGNORED(-Wdeprecated-declarations)
146
/* Suppress deprecation warnings of MD5 from Xcode 11.1 */
157
/* Although we know MD5 is deprecated too, provide just for backward

ext/digest/md5/md5init.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <ruby/ruby.h>
55
#include "../digest.h"
6+
#include "../defs.h"
67
#if defined(MD5_USE_COMMONDIGEST)
78
#include "md5cc.h"
89
#else

0 commit comments

Comments
 (0)