Alexandre Julliard : urlmon: Avoid some symbol redefinitions.
Alexandre Julliard
julliard at winehq.org
Mon Jan 23 13:01:04 CST 2012
Module: wine
Branch: master
Commit: 292cb17ebbcdd0cca6076830b7e9830c5a5e7933
URL: http://source.winehq.org/git/wine.git/?a=commit;h=292cb17ebbcdd0cca6076830b7e9830c5a5e7933
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jan 23 12:01:13 2012 +0100
urlmon: Avoid some symbol redefinitions.
---
dlls/urlmon/uri.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index 1dc4922..1e25952 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define NONAMELESSUNION
+#include <limits.h>
#include "urlmon_main.h"
#include "wine/debug.h"
@@ -27,9 +27,6 @@
#include "strsafe.h"
-#define UINT_MAX 0xffffffff
-#define USHORT_MAX 0xffff
-
#define URI_DISPLAY_NO_ABSOLUTE_URI 0x1
#define URI_DISPLAY_NO_DEFAULT_PORT_AUTH 0x2
@@ -1353,7 +1350,7 @@ static BOOL parse_port(const WCHAR **ptr, parse_data *data, DWORD flags) {
port = port*10 + (**ptr-'0');
- if(port > USHORT_MAX) {
+ if(port > USHRT_MAX) {
*ptr = data->port;
data->port = NULL;
return FALSE;
More information about the wine-cvs
mailing list