diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-03-04 18:04:11 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-03-04 18:04:11 +0000 |
| commit | 3016669b4b99c161cd0a8c83e2607627f2aeabbb (patch) | |
| tree | 5fb5367c2fd0e1238d55056437ac0ba74c490bd5 /winsup/cygwin | |
| parent | 0f63e6247d6fb47580ae24200279f7c23bb9a22e (diff) | |
| download | cygnal-3016669b4b99c161cd0a8c83e2607627f2aeabbb.tar.gz cygnal-3016669b4b99c161cd0a8c83e2607627f2aeabbb.tar.bz2 cygnal-3016669b4b99c161cd0a8c83e2607627f2aeabbb.zip | |
* fhandler_clipboard.cc: Use int for cygnativeformat rather than UINT as that
is what is returned by GetPriorityClipboardFormat.
(fhandler_dev_clipboard::read): Ditto for the format variable.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_clipboard.cc | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 0ab6b8f12..7c5d314ff 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2005-03-04 Christopher Faylor <cgf@timesys.com> + + * fhandler_clipboard.cc: Use int for cygnativeformat rather than UINT + as that is what is returned by GetPriorityClipboardFormat. + (fhandler_dev_clipboard::read): Ditto for the format variable. + 2005-03-04 Corinna Vinschen <corinna@vinschen.de> * fhandler.cc (fhandler_base::open_9x): Satisfy query_open values. diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc index 25ed1ddc9..fab1424be 100644 --- a/winsup/cygwin/fhandler_clipboard.cc +++ b/winsup/cygwin/fhandler_clipboard.cc @@ -30,7 +30,7 @@ details. */ static const NO_COPY char *CYGWIN_NATIVE = "CYGWIN_NATIVE_CLIPBOARD"; /* this is MT safe because windows format id's are atomic */ -static UINT cygnativeformat; +static int cygnativeformat; fhandler_dev_clipboard::fhandler_dev_clipboard () : fhandler_base (), pos (0), membuffer (NULL), msize (0), @@ -190,7 +190,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len) HGLOBAL hglb; size_t ret; UINT formatlist[2]; - UINT format; + int format; if (eof) len = 0; else |