diff options
| author | Richard M. Stallman | 1993-03-19 05:19:23 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-03-19 05:19:23 +0000 |
| commit | 8a89415ece8d68a384451ff15ebd089cc013cf5f (patch) | |
| tree | b9fa88d3ab0d72c29d1dd74eaa90ca696a93e231 /src | |
| parent | 922ac4c59c37f1226177fd696468014a6028d8ef (diff) | |
| download | emacs-8a89415ece8d68a384451ff15ebd089cc013cf5f.tar.gz emacs-8a89415ece8d68a384451ff15ebd089cc013cf5f.zip | |
(cons_to_long, long_to_cons): No longer static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xselect.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/xselect.c b/src/xselect.c index 20aa5a9ba0e..c57f51604b3 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -229,32 +229,36 @@ x_atom_to_symbol (display, atom) | |||
| 229 | UNBLOCK_INPUT; | 229 | UNBLOCK_INPUT; |
| 230 | return val; | 230 | return val; |
| 231 | } | 231 | } |
| 232 | |||
| 233 | /* Convert between full word time values (last modification times, etc) | ||
| 234 | and their Lisp representation as a cons cell (HIGH . LOW). */ | ||
| 232 | 235 | ||
| 233 | 236 | Lisp_Object | |
| 234 | static Lisp_Object | ||
| 235 | long_to_cons (i) | 237 | long_to_cons (i) |
| 236 | unsigned long i; | 238 | unsigned long i; |
| 237 | { | 239 | { |
| 238 | unsigned int top = i >> 16; | 240 | unsigned int top = i >> 16; |
| 239 | unsigned int bot = i & 0xFFFF; | 241 | unsigned int bot = i & 0xFFFF; |
| 240 | if (top == 0) return make_number (bot); | 242 | if (top == 0) |
| 241 | if (top == 0xFFFF) return Fcons (make_number (-1), make_number (bot)); | 243 | return make_number (bot); |
| 244 | if (top == 0xFFFF) | ||
| 245 | return Fcons (make_number (-1), make_number (bot)); | ||
| 242 | return Fcons (make_number (top), make_number (bot)); | 246 | return Fcons (make_number (top), make_number (bot)); |
| 243 | } | 247 | } |
| 244 | 248 | ||
| 245 | static unsigned long | 249 | unsigned long |
| 246 | cons_to_long (c) | 250 | cons_to_long (c) |
| 247 | Lisp_Object c; | 251 | Lisp_Object c; |
| 248 | { | 252 | { |
| 249 | int top, bot; | 253 | int top, bot; |
| 250 | if (INTEGERP (c)) return XINT (c); | 254 | if (INTEGERP (c)) |
| 255 | return XINT (c); | ||
| 251 | top = XCONS (c)->car; | 256 | top = XCONS (c)->car; |
| 252 | bot = XCONS (c)->cdr; | 257 | bot = XCONS (c)->cdr; |
| 253 | if (CONSP (bot)) bot = XCONS (bot)->car; | 258 | if (CONSP (bot)) |
| 259 | bot = XCONS (bot)->car; | ||
| 254 | return ((XINT (top) << 16) | XINT (bot)); | 260 | return ((XINT (top) << 16) | XINT (bot)); |
| 255 | } | 261 | } |
| 256 | |||
| 257 | |||
| 258 | 262 | ||
| 259 | /* Do protocol to assert ourself as a selection owner. | 263 | /* Do protocol to assert ourself as a selection owner. |
| 260 | Update the Vselection_alist so that we can reply to later requests for | 264 | Update the Vselection_alist so that we can reply to later requests for |