diff options
| author | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
| commit | 1f1e803140ea96b81ac4700a6759a9617d0f2fd2 (patch) | |
| tree | e9d2761170ec2461f178a595482507700879deee /xorg/server/module/rdpMisc.h | |
| parent | 80204e2536327f46610d5925c552aff235e9f447 (diff) | |
| parent | 0b18909f269ee582ec22bb808839c4434a0da3e7 (diff) | |
| download | xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.tar.gz xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.zip | |
Merge ../../neutrinolabs/xrdp into fastpath
Conflicts:
libxrdp/libxrdp.c
libxrdp/libxrdp.h
libxrdp/xrdp_iso.c
libxrdp/xrdp_sec.c
libxrdp/xrdp_tcp.c
xrdp/xrdp.ini
Diffstat (limited to 'xorg/server/module/rdpMisc.h')
| -rw-r--r-- | xorg/server/module/rdpMisc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg/server/module/rdpMisc.h b/xorg/server/module/rdpMisc.h index 976f26c8..58f6bd31 100644 --- a/xorg/server/module/rdpMisc.h +++ b/xorg/server/module/rdpMisc.h @@ -29,6 +29,8 @@ the rest int rdpBitsPerPixel(int depth); int +g_sck_can_recv(int sck, int millis); +int g_sck_recv(int sck, void *ptr, int len, int flags); void g_sck_close(int sck); |