Merge pull request cesanta#1509 from jameshilliard/wakeup-conflict

cpq · web-flow · commit 417533e90cb9 · 2022-04-04T09:16:34.000+01:00
Fix mg_mgr_wakeup conflicting types error
diff --git a/test/mongoose_custom.c b/test/mongoose_custom.c
@@ -23,8 +23,9 @@ bool mg_send(struct mg_connection *c, const void *buf, size_t len) {
   return 0;
 }
 
-void mg_mgr_wakeup(struct mg_connection *c, const void *buf, size_t len) {
+bool mg_mgr_wakeup(struct mg_connection *c, const void *buf, size_t len) {
   (void) c, (void) buf, (void) len;
+  return 0;
 }
 
 struct mg_connection *mg_mkpipe(struct mg_mgr *mgr, mg_event_handler_t fn,

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,9 @@ bool mg_send(struct mg_connection c, const void buf, size_t len) {`
`23`	`23`	`return 0;`
`24`	`24`	`}`
`25`	`25`
`26`		`-void mg_mgr_wakeup(struct mg_connection c, const void buf, size_t len) {`
	`26`	`+bool mg_mgr_wakeup(struct mg_connection c, const void buf, size_t len) {`
`27`	`27`	`(void) c, (void) buf, (void) len;`
	`28`	`+ return 0;`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`struct mg_connection mg_mkpipe(struct mg_mgr mgr, mg_event_handler_t fn,`