Mercurial > hg > orthanc

changeset 76:e2d68529605f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch for mingw
author jodogne
date Mon, 17 Sep 2012 17:32:33 +0200
parents 8b1428915a46
children b8dfde8d64e8
files Resources/mongoose-patch.diff
diffstat 1 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/mongoose-patch.diff	Mon Sep 17 16:31:30 2012 +0200
+++ b/Resources/mongoose-patch.diff	Mon Sep 17 17:32:33 2012 +0200
@@ -1,6 +1,18 @@
---- mongoose/mongoose.c	2012-03-11 23:41:35.000000000 +0100
-+++ mongoose.c	2012-06-22 13:44:40.093202063 +0200
-@@ -3844,10 +3844,8 @@
+--- i/mongoose/mongoose.c	2012-03-11 23:41:35.000000000 +0100
++++ mongoose.c	2012-09-17 17:32:01.000000000 +0200
+@@ -92,8 +92,9 @@
+ #define strtoll(x, y, z) strtol(x, y, z)
+ #else
+ #define __func__  __FUNCTION__
+-#define strtoull(x, y, z) _strtoui64(x, y, z)
+-#define strtoll(x, y, z) _strtoi64(x, y, z)
++#include <stdlib.h>
++//#define strtoull(x, y, z) _strtoui64(x, y, z)
++//#define strtoll(x, y, z) _strtoi64(x, y, z)
+ #endif // _MSC_VER
+ 
+ #define ERRNO   GetLastError()
+@@ -3844,10 +3845,8 @@
  }
  
  static void discard_current_request_from_buffer(struct mg_connection *conn) {
@@ -11,7 +23,7 @@
    buffered_len = conn->data_len - conn->request_len;
    assert(buffered_len >= 0);
  
-@@ -4148,7 +4146,13 @@
+@@ -4148,7 +4147,13 @@
  
    // Wait until mg_fini() stops
    while (ctx->stop_flag != 2) {