diff options
| author | Joakim Verona | 2012-10-16 17:14:35 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-10-16 17:14:35 +0200 |
| commit | 017a270078be5ae39301e3205afad80d23facbbc (patch) | |
| tree | 5c85d8c3890f3a0cead231e87823b621a8f28e16 /src/intervals.c | |
| parent | 5fcc7035c884b4419a1619551222b5f28ad9906f (diff) | |
| parent | 2b794d6940aa7dc58e297b3649b7799190d71f64 (diff) | |
| download | emacs-017a270078be5ae39301e3205afad80d23facbbc.tar.gz emacs-017a270078be5ae39301e3205afad80d23facbbc.zip | |
upstream
Diffstat (limited to 'src/intervals.c')
| -rw-r--r-- | src/intervals.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/intervals.c b/src/intervals.c index 584ee1e923d..1ed93e1302d 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -64,7 +64,7 @@ static INTERVAL reproduce_tree (INTERVAL, INTERVAL); | |||
| 64 | /* Use these functions to set Lisp_Object | 64 | /* Use these functions to set Lisp_Object |
| 65 | or pointer slots of struct interval. */ | 65 | or pointer slots of struct interval. */ |
| 66 | 66 | ||
| 67 | static inline void | 67 | static void |
| 68 | set_interval_object (INTERVAL i, Lisp_Object obj) | 68 | set_interval_object (INTERVAL i, Lisp_Object obj) |
| 69 | { | 69 | { |
| 70 | eassert (BUFFERP (obj) || STRINGP (obj)); | 70 | eassert (BUFFERP (obj) || STRINGP (obj)); |
| @@ -72,13 +72,13 @@ set_interval_object (INTERVAL i, Lisp_Object obj) | |||
| 72 | i->up.obj = obj; | 72 | i->up.obj = obj; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | static inline void | 75 | static void |
| 76 | set_interval_left (INTERVAL i, INTERVAL left) | 76 | set_interval_left (INTERVAL i, INTERVAL left) |
| 77 | { | 77 | { |
| 78 | i->left = left; | 78 | i->left = left; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | static inline void | 81 | static void |
| 82 | set_interval_right (INTERVAL i, INTERVAL right) | 82 | set_interval_right (INTERVAL i, INTERVAL right) |
| 83 | { | 83 | { |
| 84 | i->right = right; | 84 | i->right = right; |
| @@ -87,7 +87,7 @@ set_interval_right (INTERVAL i, INTERVAL right) | |||
| 87 | /* Make the parent of D be whatever the parent of S is, regardless | 87 | /* Make the parent of D be whatever the parent of S is, regardless |
| 88 | of the type. This is used when balancing an interval tree. */ | 88 | of the type. This is used when balancing an interval tree. */ |
| 89 | 89 | ||
| 90 | static inline void | 90 | static void |
| 91 | copy_interval_parent (INTERVAL d, INTERVAL s) | 91 | copy_interval_parent (INTERVAL d, INTERVAL s) |
| 92 | { | 92 | { |
| 93 | d->up = s->up; | 93 | d->up = s->up; |
| @@ -341,7 +341,7 @@ root_interval (INTERVAL interval) | |||
| 341 | c c | 341 | c c |
| 342 | */ | 342 | */ |
| 343 | 343 | ||
| 344 | static inline INTERVAL | 344 | static INTERVAL |
| 345 | rotate_right (INTERVAL interval) | 345 | rotate_right (INTERVAL interval) |
| 346 | { | 346 | { |
| 347 | INTERVAL i; | 347 | INTERVAL i; |
| @@ -388,7 +388,7 @@ rotate_right (INTERVAL interval) | |||
| 388 | c c | 388 | c c |
| 389 | */ | 389 | */ |
| 390 | 390 | ||
| 391 | static inline INTERVAL | 391 | static INTERVAL |
| 392 | rotate_left (INTERVAL interval) | 392 | rotate_left (INTERVAL interval) |
| 393 | { | 393 | { |
| 394 | INTERVAL i; | 394 | INTERVAL i; |
| @@ -466,7 +466,7 @@ balance_an_interval (INTERVAL i) | |||
| 466 | /* Balance INTERVAL, potentially stuffing it back into its parent | 466 | /* Balance INTERVAL, potentially stuffing it back into its parent |
| 467 | Lisp Object. */ | 467 | Lisp Object. */ |
| 468 | 468 | ||
| 469 | static inline INTERVAL | 469 | static INTERVAL |
| 470 | balance_possible_root_interval (INTERVAL interval) | 470 | balance_possible_root_interval (INTERVAL interval) |
| 471 | { | 471 | { |
| 472 | Lisp_Object parent; | 472 | Lisp_Object parent; |