aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorAndreas Schwab2003-03-12 23:48:40 +0000
committerAndreas Schwab2003-03-12 23:48:40 +0000
commit2f51feb82db7d38b1580e57ca0fb7635c03da52d (patch)
tree6474d8fadef6380d450820ca9ecb471a48e029af /src/xselect.c
parent9bc7166b125412b7ca7ed533ec59322c23521d63 (diff)
downloademacs-2f51feb82db7d38b1580e57ca0fb7635c03da52d.tar.gz
emacs-2f51feb82db7d38b1580e57ca0fb7635c03da52d.zip
(selection_data_to_lisp_data): Use int instead of
long for an integer of size 4.
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xselect.c b/src/xselect.c
index ffd7b8d7fc0..bf1690e909f 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1,5 +1,5 @@
1/* X Selection processing for Emacs. 1/* X Selection processing for Emacs.
2 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001 2 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -1695,8 +1695,8 @@ selection_data_to_lisp_data (display, data, size, type, format)
1695 If the number is > 16 bits, convert it to a cons of integers, 1695 If the number is > 16 bits, convert it to a cons of integers,
1696 16 bits in each half. 1696 16 bits in each half.
1697 */ 1697 */
1698 else if (format == 32 && size == sizeof (long)) 1698 else if (format == 32 && size == sizeof (int))
1699 return long_to_cons (((unsigned long *) data) [0]); 1699 return long_to_cons (((unsigned int *) data) [0]);
1700 else if (format == 16 && size == sizeof (short)) 1700 else if (format == 16 && size == sizeof (short))
1701 return make_number ((int) (((unsigned short *) data) [0])); 1701 return make_number ((int) (((unsigned short *) data) [0]));
1702 1702
@@ -1721,7 +1721,7 @@ selection_data_to_lisp_data (display, data, size, type, format)
1721 Lisp_Object v = Fmake_vector (make_number (size / 4), make_number (0)); 1721 Lisp_Object v = Fmake_vector (make_number (size / 4), make_number (0));
1722 for (i = 0; i < size / 4; i++) 1722 for (i = 0; i < size / 4; i++)
1723 { 1723 {
1724 unsigned long j = ((unsigned long *) data) [i]; 1724 unsigned int j = ((unsigned int *) data) [i];
1725 Faset (v, make_number (i), long_to_cons (j)); 1725 Faset (v, make_number (i), long_to_cons (j));
1726 } 1726 }
1727 return v; 1727 return v;