platform/upstream/freerdp.git
12 years agocunit: Run all tests if called with no arguments.
Mike Gilbert [Sat, 21 Apr 2012 15:19:59 +0000 (11:19 -0400)]
cunit: Run all tests if called with no arguments.

Also add a --help parameter to show usage.

12 years agoMerge pull request #551 from azenk/master
Marc-André Moreau [Sat, 14 Apr 2012 16:18:05 +0000 (09:18 -0700)]
Merge pull request #551 from azenk/master

Added --certificate-name option to the usage text

12 years agoadded reference to certificate-name
Andrew Zenk [Sat, 14 Apr 2012 16:05:20 +0000 (11:05 -0500)]
added reference to certificate-name

12 years agoupdated --certificate-name usage text
Andrew Zenk [Sat, 14 Apr 2012 15:28:40 +0000 (10:28 -0500)]
updated --certificate-name usage text

12 years agoAdded certificate name option to help display
Andrew Zenk [Sat, 14 Apr 2012 15:18:34 +0000 (10:18 -0500)]
Added certificate name option to help display

12 years agoMerge pull request #550 from chihchun/master
Vic Lee [Sat, 14 Apr 2012 02:24:05 +0000 (19:24 -0700)]
Merge pull request #550 from chihchun/master

Update freerdp.pc

12 years agoMerge pull request #548 from llyzs/server
Vic Lee [Sat, 14 Apr 2012 02:23:44 +0000 (19:23 -0700)]
Merge pull request #548 from llyzs/server

server: implement user-initiated disconnection sequence on server.

12 years agoUpdate freerdp.pc - add freerdp-cache, reerdp-sspi, remove freeerdp-auth
Rex Tsai [Fri, 13 Apr 2012 14:57:15 +0000 (22:57 +0800)]
Update freerdp.pc - add freerdp-cache, reerdp-sspi, remove freeerdp-auth

Signed-off-by: Rex Tsai <rex.tsai@canonical.com>
12 years agoserver: implement user-initiated disconnection sequence on server.
Vic Lee [Fri, 13 Apr 2012 07:58:28 +0000 (15:58 +0800)]
server: implement user-initiated disconnection sequence on server.

12 years agoMerge pull request #547 from llyzs/x11
Vic Lee [Fri, 13 Apr 2012 06:33:56 +0000 (23:33 -0700)]
Merge pull request #547 from llyzs/x11

x11: release all pressed keys when window is unmapped.

12 years agoinclude: update windows type definitions
Marc-André Moreau [Thu, 12 Apr 2012 18:51:03 +0000 (14:51 -0400)]
include: update windows type definitions

12 years agox11: use ARRAY_SIZE macro.
Vic Lee [Thu, 12 Apr 2012 05:50:20 +0000 (13:50 +0800)]
x11: use ARRAY_SIZE macro.

12 years agox11: release all pressed keys when window is unmapped.
Vic Lee [Wed, 11 Apr 2012 04:37:47 +0000 (12:37 +0800)]
x11: release all pressed keys when window is unmapped.

12 years agoMerge pull request #546 from trou/mymaster
Marc-André Moreau [Tue, 10 Apr 2012 22:28:15 +0000 (15:28 -0700)]
Merge pull request #546 from trou/mymaster

fix issues 530 and 531

12 years agofix issue #530 "NLA password asked after certificate refusal"
Raphaël Rigo [Tue, 10 Apr 2012 20:24:08 +0000 (22:24 +0200)]
fix issue #530 "NLA password asked after certificate refusal"
close connection when the certificate is not trusted

12 years agofix TLS free logic, fixing double free in issue #531
Raphaël Rigo [Tue, 10 Apr 2012 19:15:36 +0000 (21:15 +0200)]
fix TLS free logic, fixing double free in issue #531

12 years agolibfreerdp-core: fix connection issue where drawing functions were called in rdp_connect
Jay Sorg [Mon, 9 Apr 2012 17:28:33 +0000 (10:28 -0700)]
libfreerdp-core: fix connection issue where drawing functions were called in rdp_connect

12 years agoMerge pull request #544 from bmiklautz/static_inline
Marc-André Moreau [Fri, 6 Apr 2012 19:36:15 +0000 (12:36 -0700)]
Merge pull request #544 from bmiklautz/static_inline

Changed some functions from inline to static inline

12 years agoMerge pull request #533 from atong/master
Marc-André Moreau [Fri, 6 Apr 2012 19:35:50 +0000 (12:35 -0700)]
Merge pull request #533 from atong/master

xfreerdp: send extended mouse events, using common button values for now

12 years agoMerge pull request #545 from pjd/fixes
Marc-André Moreau [Fri, 6 Apr 2012 19:35:27 +0000 (12:35 -0700)]
Merge pull request #545 from pjd/fixes

More sane user_id and missing config.h inclusion.

12 years agoSet user_id in a way that matches Windows behaviour.
Pawel Jakub Dawidek [Fri, 6 Apr 2012 18:55:51 +0000 (20:55 +0200)]
Set user_id in a way that matches Windows behaviour.

12 years agoDon't forget to include config.h.
Pawel Jakub Dawidek [Fri, 6 Apr 2012 18:55:22 +0000 (20:55 +0200)]
Don't forget to include config.h.

12 years agoChanged some functions from inline to static inline
Bernhard Miklautz [Wed, 4 Apr 2012 13:23:16 +0000 (15:23 +0200)]
Changed some functions from inline to static inline

This fixes inline build issues with clang.
http://clang.llvm.org/compatibility.html#inline

12 years agowfreerdp: fix data alignment for MSVC
Marc-André Moreau [Tue, 3 Apr 2012 00:56:59 +0000 (20:56 -0400)]
wfreerdp: fix data alignment for MSVC

12 years agolibfreerdp-core: align rdpSettings structure to 8 bytes
Marc-André Moreau [Tue, 3 Apr 2012 00:38:58 +0000 (20:38 -0400)]
libfreerdp-core: align rdpSettings structure to 8 bytes

12 years agoxfreerdp: send extended mouse events, using common button values for now
Anthony Tong [Sun, 1 Apr 2012 13:35:11 +0000 (09:35 -0400)]
xfreerdp: send extended mouse events, using common button values for now

12 years agoMerge pull request #532 from trou/master
Marc-André Moreau [Sat, 31 Mar 2012 14:48:34 +0000 (07:48 -0700)]
Merge pull request #532 from trou/master

Really fix negotiation logic

12 years agoMerge branch 'master' of git://github.com/FreeRDP/FreeRDP
Trou [Sat, 31 Mar 2012 14:15:09 +0000 (16:15 +0200)]
Merge branch 'master' of git://github.com/FreeRDP/FreeRDP

12 years agoREALLY fix negociation this time
Trou [Sat, 31 Mar 2012 14:09:19 +0000 (16:09 +0200)]
REALLY fix negociation this time

12 years agoMerge pull request #529 from kiilerix/master
Marc-André Moreau [Sat, 31 Mar 2012 06:15:33 +0000 (23:15 -0700)]
Merge pull request #529 from kiilerix/master

some windows compile fixes

12 years agofix negotiation with NLA
Trou [Sat, 31 Mar 2012 00:55:13 +0000 (02:55 +0200)]
fix negotiation with NLA

12 years agocodec: export mppc functions so it can be build on windows
Mads Kiilerich [Fri, 30 Mar 2012 21:28:07 +0000 (23:28 +0200)]
codec: export mppc functions so it can be build on windows

12 years agowfreerdp: fix typo in incomplete keyboard refactorings
Mads Kiilerich [Fri, 30 Mar 2012 21:28:03 +0000 (23:28 +0200)]
wfreerdp: fix typo in incomplete keyboard refactorings

12 years agowfreerdp: handle invalid command line arguments in a slightly more elegant way
Mads Kiilerich [Fri, 30 Mar 2012 21:27:21 +0000 (23:27 +0200)]
wfreerdp: handle invalid command line arguments in a slightly more elegant way

12 years agoMerge pull request #528 from kiilerix/master
Anthony [Fri, 30 Mar 2012 19:47:09 +0000 (12:47 -0700)]
Merge pull request #528 from kiilerix/master

a valgrind fix and a non-controversial keyboard fix

12 years agocore: use valid default values for Client Core Data keyboardType and keyboardFunctionKey
Mads Kiilerich [Fri, 30 Mar 2012 19:37:39 +0000 (21:37 +0200)]
core: use valid default values for Client Core Data keyboardType and keyboardFunctionKey

12 years agocache: fix off-by-one-of-the-wrong-kind in BITMAP_CACHE_WAITING_LIST_INDEX handling
Mads Kiilerich [Fri, 30 Mar 2012 19:37:30 +0000 (21:37 +0200)]
cache: fix off-by-one-of-the-wrong-kind in BITMAP_CACHE_WAITING_LIST_INDEX handling

12 years agoMerge pull request #526 from trou/master
Marc-André Moreau [Fri, 30 Mar 2012 15:34:58 +0000 (08:34 -0700)]
Merge pull request #526 from trou/master

Fix security negociation when standard RDP is refused and enable salted checksums by default

12 years agoMerge pull request #519 from kiilerix/master
Marc-André Moreau [Fri, 30 Mar 2012 15:34:13 +0000 (08:34 -0700)]
Merge pull request #519 from kiilerix/master

build fixes

12 years agoMerge pull request #521 from bmiklautz/ximage_leak
Anthony [Fri, 30 Mar 2012 14:16:09 +0000 (07:16 -0700)]
Merge pull request #521 from bmiklautz/ximage_leak

xfreerdp: nocodec/nscodec free ximages after use

12 years agoenable secure checksums by default
Raphael Rigo [Fri, 30 Mar 2012 09:44:36 +0000 (11:44 +0200)]
enable secure checksums by default

12 years agoMerge branch 'master' of git://github.com/FreeRDP/FreeRDP
Raphael Rigo [Fri, 30 Mar 2012 09:17:17 +0000 (11:17 +0200)]
Merge branch 'master' of git://github.com/FreeRDP/FreeRDP

12 years agomppc: moved to libfreerdp-codec
Jay Sorg [Fri, 30 Mar 2012 03:57:26 +0000 (20:57 -0700)]
mppc: moved to libfreerdp-codec

12 years agofix negociation check
Raphael Rigo [Thu, 29 Mar 2012 18:09:21 +0000 (20:09 +0200)]
fix negociation check

12 years agofix negociation when standard rdp security is disabled
Raphael Rigo [Thu, 29 Mar 2012 18:06:17 +0000 (20:06 +0200)]
fix negociation when standard rdp security is disabled

12 years agoxfreerdp: nocodec/nscodec free ximages after use
Bernhard Miklautz [Thu, 29 Mar 2012 11:01:42 +0000 (13:01 +0200)]
xfreerdp: nocodec/nscodec free ximages after use

12 years agolocale: update rdp scancodes according to Win CE "Translating Scan Codes to Virtual...
Mads Kiilerich [Wed, 28 Mar 2012 23:25:49 +0000 (01:25 +0200)]
locale: update rdp scancodes according to Win CE "Translating Scan Codes to Virtual-Key Codes"

The values in @msdn{ms892480} seems to be what is used in TS_KEYBOARD_EVENT @msdn{cc240584}.

All the "XT Scan Code Translation Libraries" has been checked and integrated.
Only the Korean has been skipped. It is clearly something completely different
from everything else. The Japanese is just an extension of the US keyboard like
the others.

12 years agolocale: add Japanese backslash key with rdp scancode 7D and X key name AE13
Mads Kiilerich [Wed, 28 Mar 2012 23:12:48 +0000 (01:12 +0200)]
locale: add Japanese backslash key with rdp scancode 7D and X key name AE13

Correct values for the keyboard fields in Client Core Data is required too.

12 years agolocale: drop Virtual-Key as intermediate format for xkbfile
Mads Kiilerich [Wed, 28 Mar 2012 23:12:48 +0000 (01:12 +0200)]
locale: drop Virtual-Key as intermediate format for xkbfile

There is no 1:1 mapping between Virtual-Key codes and the "scancodes" used in
the rdp protocol. Some examples are VK_RETURN and VK_DIVIDE and US keyboards
where two different physical keys with different "scancodes" in the protocol
map to the same Virtual-Key on the server. Another bad fit seems to be the
Japanese backslash key.

The rdp scancodes are apparently undocumented and different from everything
else. The best we can do is to reverse engineer the protocol values and give
them some descriptive names and try to figure out how they relate to the native
scancodes on the supported platforms.

12 years agoclients: use rdp scancode definitions when sending key events
Mads Kiilerich [Wed, 28 Mar 2012 23:12:48 +0000 (01:12 +0200)]
clients: use rdp scancode definitions when sending key events

This also introduces a slightly more high-level convenience function for
sending key events. The existing function where an RDP protocol flag field has
to be encoded by the caller is very lowlevel ... and a bad fit for fastpath
input. That could use a refactoring.

12 years agolocale: #define known rdp scancode values
Mads Kiilerich [Wed, 28 Mar 2012 23:12:48 +0000 (01:12 +0200)]
locale: #define known rdp scancode values

For now they are named after the VK code they mostly correspond to.

12 years agolocale: make RDP_SCANCODE a simple value type that easily can be passed around
Mads Kiilerich [Wed, 28 Mar 2012 23:12:35 +0000 (01:12 +0200)]
locale: make RDP_SCANCODE a simple value type that easily can be passed around

12 years agoserver: fix building without XTest
Mads Kiilerich [Wed, 28 Mar 2012 23:10:58 +0000 (01:10 +0200)]
server: fix building without XTest

12 years agofix building on X11 without XKBFILE
Mads Kiilerich [Wed, 28 Mar 2012 23:10:57 +0000 (01:10 +0200)]
fix building on X11 without XKBFILE

12 years agolibfreerdp-cache: complete update_pointer_color
Jay Sorg [Wed, 28 Mar 2012 22:34:56 +0000 (15:34 -0700)]
libfreerdp-cache: complete update_pointer_color

12 years agoMerge pull request #517 from dorianj/master
Marc-André Moreau [Tue, 27 Mar 2012 19:58:04 +0000 (12:58 -0700)]
Merge pull request #517 from dorianj/master

libfreerdp-utils: fix freerdp_append_shared_library_suffix on OS X

12 years agoMerge pull request #516 from atong/master
Marc-André Moreau [Tue, 27 Mar 2012 19:56:40 +0000 (12:56 -0700)]
Merge pull request #516 from atong/master

cache: fix BITMAP_CACHE_WAITING_LIST_INDEX handling

12 years agolibfreerdp-utils: make freerdp_append_shared_library_suffix work when file_path is...
Dorian Johnson [Tue, 27 Mar 2012 19:54:10 +0000 (14:54 -0500)]
libfreerdp-utils: make freerdp_append_shared_library_suffix work when file_path is shorter than the suffix, which is true for 'rail' and '.dylib'.

12 years agocache: fix BITMAP_CACHE_WAITING_LIST_INDEX handling
Anthony Tong [Tue, 27 Mar 2012 19:44:03 +0000 (15:44 -0400)]
cache: fix BITMAP_CACHE_WAITING_LIST_INDEX handling

12 years agomppc_enc: add hash tables to speed up mppc encoder
Jay Sorg [Tue, 27 Mar 2012 07:43:53 +0000 (00:43 -0700)]
mppc_enc: add hash tables to speed up mppc encoder

12 years agolibfreerdp-sspi: added wintypes.h
Marc-André Moreau [Sun, 25 Mar 2012 21:08:05 +0000 (17:08 -0400)]
libfreerdp-sspi: added wintypes.h

12 years agolibfreerdp-sspi: add _T() macro
Marc-André Moreau [Sat, 24 Mar 2012 22:01:56 +0000 (18:01 -0400)]
libfreerdp-sspi: add _T() macro

12 years agolibfreerdp-sspi: fix UNICODE support, can connect successfully in both modes now
Marc-André Moreau [Sat, 24 Mar 2012 20:23:14 +0000 (16:23 -0400)]
libfreerdp-sspi: fix UNICODE support, can connect successfully in both modes now

12 years agolibfreerdp-sspi: fix compilation on Linux without UNICODE definition
Marc-André Moreau [Sat, 24 Mar 2012 20:02:58 +0000 (16:02 -0400)]
libfreerdp-sspi: fix compilation on Linux without UNICODE definition

12 years agolibfreerdp-sspi: fix compilation on windows with UNICODE defined
Marc-André Moreau [Sat, 24 Mar 2012 19:47:16 +0000 (15:47 -0400)]
libfreerdp-sspi: fix compilation on windows with UNICODE defined

12 years agolibfreerdp-sspi: fix compilation on Linux
Marc-André Moreau [Sat, 24 Mar 2012 05:01:28 +0000 (01:01 -0400)]
libfreerdp-sspi: fix compilation on Linux

12 years agolibfreerdp-sspi: start implementing ASCII and Unicode methods
Marc-André Moreau [Sat, 24 Mar 2012 04:14:45 +0000 (00:14 -0400)]
libfreerdp-sspi: start implementing ASCII and Unicode methods

12 years agocunit: fix SSPI unit tests
Marc-André Moreau [Sat, 24 Mar 2012 01:28:53 +0000 (21:28 -0400)]
cunit: fix SSPI unit tests

12 years agoMerge pull request #510 from jiten19/rdp6
Marc-André Moreau [Sat, 24 Mar 2012 01:26:58 +0000 (18:26 -0700)]
Merge pull request #510 from jiten19/rdp6

add RDP6 decompression

12 years agoMerge pull request #513 from kiilerix/master
Marc-André Moreau [Sat, 24 Mar 2012 01:25:15 +0000 (18:25 -0700)]
Merge pull request #513 from kiilerix/master

a crypto+redirect fix and manu small steps with locale / keyboard refactoring

12 years agolocale: debug statements and indentation
Mads Kiilerich [Sat, 24 Mar 2012 01:01:12 +0000 (02:01 +0100)]
locale: debug statements and indentation

12 years agolocale: reintroduce sun keyboard layouts and fix sun compilation
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: reintroduce sun keyboard layouts and fix sun compilation

Untested.

12 years agolocale: plug some xkb / keymap leaks
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: plug some xkb / keymap leaks

12 years agolocale: don't fall back to keymap detection when xkbfile is used
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: don't fall back to keymap detection when xkbfile is used

12 years agolocale: reintroduce use of freerdp_detect_keyboard for default keyboard layout id
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: reintroduce use of freerdp_detect_keyboard for default keyboard layout id

12 years agolocale: encapsulate X11_KEYCODE_TO_RDP_SCANCODE in keyboard.c
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: encapsulate X11_KEYCODE_TO_RDP_SCANCODE in keyboard.c

12 years agolocale: encapsulate RDP_SCANCODE_TO_X11_KEYCODE in keyboard.c
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: encapsulate RDP_SCANCODE_TO_X11_KEYCODE in keyboard.c

12 years agolocale: move conversion from xkb layout names to RDP IDs to xkb_layout_ids.c
Mads Kiilerich [Sat, 24 Mar 2012 00:57:10 +0000 (01:57 +0100)]
locale: move conversion from xkb layout names to RDP IDs to xkb_layout_ids.c

Refactoring - no semantic changes.

12 years agolocale: drop redundant VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
locale: drop redundant VIRTUAL_KEY_CODE_TO_RDP_SCANCODE_TABLE

The same information can be found in VIRTUAL_KEY_CODE_TO_DEFAULT_RDP_SCANCODE_TABLE.

Refactoring - no semantic changes.

12 years agolocale: move keymap parsing to keyboard_keymap.c
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
locale: move keymap parsing to keyboard_keymap.c

Refactoring - no semantic changes.

12 years agolocale: clarify that WITH_XKBFILE is subordinate to WITH_X11
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
locale: clarify that WITH_XKBFILE is subordinate to WITH_X11

This should make no visible change in sane configurations.

12 years agolocale: clarify internally what is xkbfile and what is xkb
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
locale: clarify internally what is xkbfile and what is xkb

Refactoring - no semantic changes.

--HG--
rename : libfreerdp-locale/keyboard_xkb.c => libfreerdp-locale/keyboard_xkbfile.c
rename : libfreerdp-locale/keyboard_xkb.h => libfreerdp-locale/keyboard_xkbfile.h

12 years agolocale: move Virtual-Key Code definitions to virtual_key_codes.[ch]
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
locale: move Virtual-Key Code definitions to virtual_key_codes.[ch]

Refactoring - no semantic changes.

12 years agolocale: introduce freerdp_keyboard_get_virtual_key_code_from_name
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
locale: introduce freerdp_keyboard_get_virtual_key_code_from_name

Refactoring - no semantic changes.

12 years agocore: reset crypto key counters when the keys are initialized
Mads Kiilerich [Sat, 24 Mar 2012 00:57:09 +0000 (01:57 +0100)]
core: reset crypto key counters when the keys are initialized

This fixes --sec rdp --salted-checksum in combination with farm redirect.

The counters are implicitly set to 0 in rdp_new, but they also has to be reset
after redirects. Resetting the counters when the keys are reset seems like the
cleanest solution.

12 years agolibfreerdp-sspi: avoid conflicting definitions when NATIVE_SSPI is on
Marc-André Moreau [Fri, 23 Mar 2012 22:53:10 +0000 (18:53 -0400)]
libfreerdp-sspi: avoid conflicting definitions when NATIVE_SSPI is on

12 years agowfreerdp: fix compilation warnings
Marc-André Moreau [Fri, 23 Mar 2012 22:26:03 +0000 (18:26 -0400)]
wfreerdp: fix compilation warnings

12 years agocmake: fix linker flags on Mac OS X
Marc-André Moreau [Fri, 23 Mar 2012 00:37:05 +0000 (20:37 -0400)]
cmake: fix linker flags on Mac OS X

12 years agoMerge pull request #511 from kiilerix/master
Marc-André Moreau [Thu, 22 Mar 2012 20:43:55 +0000 (13:43 -0700)]
Merge pull request #511 from kiilerix/master

various polishing

12 years agoupdate rpm spec, align it more with the Fedora rpm spec
Mads Kiilerich [Thu, 22 Mar 2012 20:37:47 +0000 (21:37 +0100)]
update rpm spec, align it more with the Fedora rpm spec

12 years agox: tell politely why xfreerdp is closing without making it look like an error
Mads Kiilerich [Thu, 22 Mar 2012 20:30:39 +0000 (21:30 +0100)]
x: tell politely why xfreerdp is closing without making it look like an error

12 years agox: improve debugging of X events
Mads Kiilerich [Thu, 22 Mar 2012 20:30:15 +0000 (21:30 +0100)]
x: improve debugging of X events

12 years agocore: tweak rdp debugging
Mads Kiilerich [Thu, 22 Mar 2012 13:34:08 +0000 (14:34 +0100)]
core: tweak rdp debugging

12 years agocmake: remove unused configuration options
Mads Kiilerich [Thu, 22 Mar 2012 12:33:54 +0000 (13:33 +0100)]
cmake: remove unused configuration options

12 years agocmake: add missing debug options WITH_DEBUG_NTLM WITH_DEBUG_RDP
Mads Kiilerich [Thu, 22 Mar 2012 12:33:51 +0000 (13:33 +0100)]
cmake: add missing debug options WITH_DEBUG_NTLM WITH_DEBUG_RDP

12 years agocmake: cleanup of debug options, sort the list
Mads Kiilerich [Thu, 22 Mar 2012 12:33:01 +0000 (13:33 +0100)]
cmake: cleanup of debug options, sort the list

12 years agoMerge pull request #509 from kiilerix/master
Marc-André Moreau [Wed, 21 Mar 2012 22:32:10 +0000 (15:32 -0700)]
Merge pull request #509 from kiilerix/master

towards compiling with mingw

12 years agoutil windows.h: include winsock2.h before windows.h
Mads Kiilerich [Wed, 21 Mar 2012 22:15:46 +0000 (23:15 +0100)]
util windows.h: include winsock2.h before windows.h

That seems to be the right way to do it ...

12 years agocmake: don't try to detect OpenSSL if OPENSSL_INCLUDE_DIR and OPENSSL_LIBRARIES are...
Mads Kiilerich [Wed, 21 Mar 2012 22:15:46 +0000 (23:15 +0100)]
cmake: don't try to detect OpenSSL if OPENSSL_INCLUDE_DIR and OPENSSL_LIBRARIES are defined

--HG--
extra : rebase_source : fee9366943406e93964821a1991f1ac0c03983e5

12 years agoreduce the use of windows.h in header files
Mads Kiilerich [Wed, 21 Mar 2012 22:13:35 +0000 (23:13 +0100)]
reduce the use of windows.h in header files

--HG--
extra : rebase_source : 3d15968fcc5255e99a7343aeef2b2a79d71c6704