ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/include/misc.h
(Generate patch)

Comparing:
ircd-hybrid-7.2/include/s_misc.h (file contents), Revision 1004 by michael, Mon Aug 31 21:29:56 2009 UTC vs.
ircd-hybrid/trunk/include/s_misc.h (file contents), Revision 1846 by michael, Mon Apr 22 18:59:59 2013 UTC

# Line 31 | Line 31 | extern const char *smalldate(time_t);
31   extern char *ssl_get_cipher(const SSL *);
32   #endif
33  
34 < #define _1MEG     (1024.0)
35 < #define _1GIG     (1024.0*1024.0)
36 < #define _1TER     (1024.0*1024.0*1024.0)
34 > /* Just blindly define our own MIN/MAX macro */
35 >
36 > #define IRCD_MAX(a, b)  ((a) > (b) ? (a) : (b))
37 > #define IRCD_MIN(a, b)  ((a) < (b) ? (a) : (b))
38 >
39 > #define _1MEG     (1024.0f)
40 > #define _1GIG     (1024.0f*1024.0f)
41 > #define _1TER     (1024.0f*1024.0f*1024.0f)
42   #define _GMKs(x)  (((x) > _1TER) ? "Terabytes" : (((x) > _1GIG) ? "Gigabytes" :\
43                    (((x) > _1MEG) ? "Megabytes" : "Kilobytes")))
44   #define _GMKv(x)  (((x) > _1TER) ? (float)((x)/_1TER) : (((x) > _1GIG) ? \

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)