0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 01:37:56 +08:00

Merge pull request #3613 from TomzBench/mingw-fix

no void pointer to store function pointer
This commit is contained in:
Luca Boccassi 2019-08-19 11:15:29 +01:00 committed by GitHub
commit 9bb197e030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions

14
RELICENSE/tomzbench.md Normal file
View File

@ -0,0 +1,14 @@
# Permission to Relicense under MPLv2
This is a statement by Thomas Chiantia
that grants permission to relicense its copyrights in the libzmq C++
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
A portion of the commits made by the Github handle "tomzbench", with
commit author "Thomas<Thomas@Altronix.com>", are copyright of
Thomas Chiantia.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Thomas Chiantia
2019/08/10

View File

@ -117,11 +117,14 @@ struct thread_info_t
#pragma pack(pop)
}
typedef struct _MY_EXCEPTION_REGISTRATION_RECORD
struct MY_EXCEPTION_REGISTRATION_RECORD
{
struct _MY_EXCEPTION_REGISTRATION_RECORD *Next;
void *Handler;
} MY_EXCEPTION_REGISTRATION_RECORD;
typedef EXCEPTION_DISPOSITION (NTAPI *HandlerFunctionType) (
EXCEPTION_RECORD *, void *, CONTEXT *, void *);
MY_EXCEPTION_REGISTRATION_RECORD *Next;
HandlerFunctionType Handler;
};
static EXCEPTION_DISPOSITION NTAPI continue_execution (EXCEPTION_RECORD *rec,
void *frame,