Skip to content

feat: update header files to support openresty-1.23.5.1 #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 20, 2024
Merged

feat: update header files to support openresty-1.23.5.1 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4618788
fix: change the order of header files
zll600 Jan 29, 2024
7b76ac0
fix: change the order of header files
zll600 Jan 29, 2024
ea5933f
fix: change the order of header files
zll600 Jan 29, 2024
0cae163
fix: change the order of header files
zll600 Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions gen_wasm_host_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#ifndef NGX_HTTP_WASM_API_DEF_H
#define NGX_HTTP_WASM_API_DEF_H


#include <ngx_config.h>
#include <ngx_core.h>


Expand All @@ -59,9 +59,10 @@
#define $vm_api_header_name


#include <ngx_config.h>
#include <ngx_core.h>
#include <wasm.h>
$vm_header
#include <ngx_core.h>
#include "proxy_wasm/proxy_wasm_types.h"
#include "http/ngx_http_wasm_api_def.h"

Expand Down
5 changes: 5 additions & 0 deletions src/http/ngx_http_wasm_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
*
*/
#define _GNU_SOURCE /* for RTLD_DEFAULT */

#include <ngx_config.h>
#include <ngx_core.h>


#include <dlfcn.h>
#include "vm/vm.h"
#include "ngx_http_wasm_api.h"
Expand Down
2 changes: 1 addition & 1 deletion src/http/ngx_http_wasm_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef NGX_HTTP_WASM_API_H
#define NGX_HTTP_WASM_API_H


#include <ngx_config.h>
#include <ngx_core.h>


Expand Down
2 changes: 1 addition & 1 deletion src/http/ngx_http_wasm_api_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef NGX_HTTP_WASM_API_DEF_H
#define NGX_HTTP_WASM_API_DEF_H


#include <ngx_config.h>
#include <ngx_core.h>


Expand Down
3 changes: 2 additions & 1 deletion src/http/ngx_http_wasm_api_wasmedge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
#define NGX_HTTP_WASM_API_WASMEDGE_H


#include <ngx_config.h>
#include <ngx_core.h>
#include <wasm.h>
#include <wasmedge/wasmedge.h>
#include <ngx_core.h>
#include "proxy_wasm/proxy_wasm_types.h"
#include "http/ngx_http_wasm_api_def.h"

Expand Down
3 changes: 2 additions & 1 deletion src/http/ngx_http_wasm_api_wasmtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
#define NGX_HTTP_WASM_API_WASMTIME_H


#include <ngx_config.h>
#include <ngx_core.h>
#include <wasm.h>
#include <wasmtime.h>
#include <ngx_core.h>
#include "proxy_wasm/proxy_wasm_types.h"
#include "http/ngx_http_wasm_api_def.h"

Expand Down
3 changes: 2 additions & 1 deletion src/http/ngx_http_wasm_call.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
#ifndef NGX_HTTP_WASM_CALL_H
#define NGX_HTTP_WASM_CALL_H


#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>


Expand Down
2 changes: 1 addition & 1 deletion src/http/ngx_http_wasm_ctx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef NGX_HTTP_WASM_CTX_H
#define NGX_HTTP_WASM_CTX_H


#include <ngx_config.h>
#include <ngx_core.h>
#include "ngx_http_wasm_state.h"
#include "proxy_wasm/proxy_wasm_types.h"
Expand Down
2 changes: 1 addition & 1 deletion src/http/ngx_http_wasm_module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef NGX_HTTP_WASM_MODULE_H
#define NGX_HTTP_WASM_MODULE_H


#include <ngx_config.h>
#include <ngx_core.h>


Expand Down
2 changes: 1 addition & 1 deletion src/http/ngx_http_wasm_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef NGX_HTTP_WASM_STATE_H
#define NGX_HTTP_WASM_STATE_H


#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>

Expand Down
4 changes: 3 additions & 1 deletion src/proxy_wasm/proxy_wasm_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
*/
#ifndef PROXY_WASM_MAP_H
#define PROXY_WASM_MAP_H
#include <stdbool.h>

#include <ngx_config.h>
#include <ngx_core.h>
#include <stdbool.h>


typedef enum {
Expand Down
1 change: 1 addition & 0 deletions src/proxy_wasm/proxy_wasm_memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
#ifndef PROXY_WASM_MEMORY_H
#define PROXY_WASM_MEMORY_H
#include <ngx_config.h>
#include <ngx_core.h>


Expand Down
2 changes: 1 addition & 1 deletion src/proxy_wasm/proxy_wasm_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef PROXY_WASM_TYPES_H
#define PROXY_WASM_TYPES_H


#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http_lua_api.h>

Expand Down
3 changes: 2 additions & 1 deletion src/vm/vm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
#define VM_H


#include <stdbool.h>
#include <ngx_config.h>
#include <ngx_core.h>
#include <stdbool.h>


#define NGX_WASM_PARAM_VOID 1
Expand Down
3 changes: 3 additions & 0 deletions src/vm/wasmtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
* limitations under the License.
*
*/

#include <ngx_config.h>
#include <ngx_core.h>
#include <wasi.h>
#include <wasm.h>
#include <wasmtime.h>
Expand Down