ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtutil.h (file contents):
Revision 1.25 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.30 by root, Tue Nov 20 17:44:44 2007 UTC

1#ifndef RXVT_UTIL_H 1#ifndef RXVT_UTIL_H
2#define RXVT_UTIL_H 2#define RXVT_UTIL_H
3 3
4#include <cstdlib> 4#include <cstdlib>
5#include <cstring> 5#include <cstring>
6
7using namespace std;
6 8
7#define PP_CONCAT_(a, b) a ## b 9#define PP_CONCAT_(a, b) a ## b
8#define PP_CONCAT(a, b) PP_CONCAT_(a, b) 10#define PP_CONCAT(a, b) PP_CONCAT_(a, b)
9#define PP_STRINGIFY_(a) #a 11#define PP_STRINGIFY_(a) #a
10#define PP_STRINGIFY(a) PP_STRINGIFY_(a) 12#define PP_STRINGIFY(a) PP_STRINGIFY_(a)
11 13
12// actually, some gcc-3.x versions work, too 14#define HAVE_GCC_BUILTINS (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ == 4))
13#define HAVE_GCC_BUILTINS (__GNUC__ >= 4)
14 15
15#ifndef __attribute__
16# if __GNUC__ 16#if __GNUC__ >= 3
17# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2) 17# define rxvt_attribute(x) __attribute__(x)
18# define __attribute__(x) 18#else
19# endif
20# endif
21# define __attribute__(x) 19# define rxvt_attribute(x)
22#endif 20#endif
23 21
24#define NORETURN __attribute__ ((noreturn)) 22#define NORETURN rxvt_attribute ((noreturn))
25#define UNUSED __attribute__ ((unused)) 23#define UNUSED rxvt_attribute ((unused))
26#define CONST __attribute__ ((const)) 24#define CONST rxvt_attribute ((const))
27 25
28// increases code size unless -fno-enforce-eh-specs 26// increases code size unless -fno-enforce-eh-specs
29#if __GNUC__ 27#if __GNUC__
30# define NOTHROW 28# define NOTHROW
31# define THROW(x) 29# define THROW(x)
… …
61// linear interpolation 59// linear interpolation
62template<typename T, typename U, typename P> 60template<typename T, typename U, typename P>
63static inline 61static inline
64T lerp (T a, U b, P p) 62T lerp (T a, U b, P p)
65{ 63{
66 return (int(a) * int(p) + int(b) * int(100 - p)) / 100; 64 return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
67} 65}
68 66
69// some bit functions, xft fuck me plenty 67// some bit functions, xft fuck me plenty
70#if HAVE_GCC_BUILTINS 68#if HAVE_GCC_BUILTINS
71static inline int ctz (unsigned int x) CONST { return __builtin_ctz (x); } 69static inline int ctz (unsigned int x) { return __builtin_ctz (x); }
72static inline int popcount (unsigned int x) CONST { return __builtin_popcount (x); } 70static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
73#else 71#else
74// count trailing zero bits and count # of one bits 72// count trailing zero bits and count # of one bits
75int ctz (unsigned int x) CONST; 73int ctz (unsigned int x) CONST;
76int popcount (unsigned int x) CONST; 74int popcount (unsigned int x) CONST;
77#endif 75#endif
… …
89 void *operator new (size_t s); 87 void *operator new (size_t s);
90 void operator delete (void *p, size_t s); 88 void operator delete (void *p, size_t s);
91}; 89};
92 90
93/* simplevec taken (and heavily modified), from: 91/* simplevec taken (and heavily modified), from:
94 * 92 *
95 * MICO --- a free CORBA implementation 93 * MICO --- a free CORBA implementation
96 * Copyright (C) 1997-98 Kay Roemer & Arno Puder 94 * Copyright (C) 1997-98 Kay Roemer & Arno Puder
97 */ 95 */
98template<class T> 96template<class T>
99struct simplevec { 97struct simplevec {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines