Commit 8a5f8439 authored by Marko Mikulicic's avatar Marko Mikulicic Committed by rojer

Make sure iobuf is renamed to mbuf everywhere

    PUBLISHED_FROM=b1049c57352286abda168df521002cfc87136fd6
parent 8f037456
############################################################# #############################################################
# Required variables for each makefile # Required variables for each makefile
# Discard this section from all parent makefiles # Discard this section from all parent makefiles
# Expected variables (with automatic defaults): # Expected variables (with automatic defaults):
# CSRCS (all "C" files in the dir) # CSRCS (all "C" files in the dir)
# SUBDIRS (all subdirs with a Makefile) # SUBDIRS (all subdirs with a Makefile)
# GEN_LIBS - list of libs to be generated () # GEN_LIBS - list of libs to be generated ()
# GEN_IMAGES - list of images to be generated () # GEN_IMAGES - list of images to be generated ()
# COMPONENTS_xxx - a list of libs/objs in the form # COMPONENTS_xxx - a list of libs/objs in the form
# subdir/lib to be extracted and rolled up into # subdir/lib to be extracted and rolled up into
# a generated lib/image xxx.a () # a generated lib/image xxx.a ()
# #
ifndef PDIR ifndef PDIR
GEN_LIBS = libuser.a GEN_LIBS = libuser.a
endif endif
############################################################# #############################################################
# Configuration i.e. compile options etc. # Configuration i.e. compile options etc.
# Target specific stuff (defines etc.) goes in here! # Target specific stuff (defines etc.) goes in here!
# Generally values applying to a tree are captured in the # Generally values applying to a tree are captured in the
# makefile at its root level - these are then overridden # makefile at its root level - these are then overridden
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
DEFINES += -DMG_LOCALS \ DEFINES += -DMG_LOCALS \
-DMG_NO_BSD_SOCKETS \ -DMG_NO_BSD_SOCKETS \
-DMG_DISABLE_FILESYSTEM \ -DMG_DISABLE_FILESYSTEM \
-DMG_DISABLE_STDIO \ -DMG_DISABLE_STDIO \
-DMG_MAX_HTTP_HEADERS=20 -DMG_MAX_HTTP_REQUEST_SIZE=1024 \ -DMG_MAX_HTTP_HEADERS=20 -DMG_MAX_HTTP_REQUEST_SIZE=1024 \
-DMG_MAX_PATH=40 -DMG_MAX_HTTP_SEND_IOBUF=1024 \ -DMG_MAX_PATH=40 -DMG_MAX_HTTP_SEND_MBUF=1024 \
-DRTOS_SDK -DMG_LWIP -DLWIP_TIMEVAL_PRIVATE=0 \ -DRTOS_SDK -DMG_LWIP -DLWIP_TIMEVAL_PRIVATE=0 \
-DMG_INTERNAL= -DMG_INTERNAL=
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
# #
# Each subtree potentially has an include directory # Each subtree potentially has an include directory
# corresponding to the common APIs applicable to modules # corresponding to the common APIs applicable to modules
# rooted at that subtree. Accordingly, the INCLUDE PATH # rooted at that subtree. Accordingly, the INCLUDE PATH
# of a module can only contain the include directories up # of a module can only contain the include directories up
# its parent path, and not its siblings # its parent path, and not its siblings
# #
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES += -I ./ INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile
...@@ -4717,7 +4717,7 @@ static void free_http_proto_data(struct mg_connection *nc) { ...@@ -4717,7 +4717,7 @@ static void free_http_proto_data(struct mg_connection *nc) {
#ifndef MG_DISABLE_FILESYSTEM #ifndef MG_DISABLE_FILESYSTEM
static void transfer_file_data(struct mg_connection *nc) { static void transfer_file_data(struct mg_connection *nc) {
struct proto_data_http *dp = (struct proto_data_http *) nc->proto_data; struct proto_data_http *dp = (struct proto_data_http *) nc->proto_data;
char buf[MG_MAX_HTTP_SEND_IOBUF]; char buf[MG_MAX_HTTP_SEND_MBUF];
int64_t left = dp->cl - dp->sent; int64_t left = dp->cl - dp->sent;
size_t n = 0, to_read = 0; size_t n = 0, to_read = 0;
......
...@@ -1839,8 +1839,8 @@ extern "C" { ...@@ -1839,8 +1839,8 @@ extern "C" {
#endif #endif
#endif #endif
#ifndef MG_MAX_HTTP_SEND_IOBUF #ifndef MG_MAX_HTTP_SEND_MBUF
#define MG_MAX_HTTP_SEND_IOBUF 4096 #define MG_MAX_HTTP_SEND_MBUF 4096
#endif #endif
#ifndef MG_WEBSOCKET_PING_INTERVAL_SECONDS #ifndef MG_WEBSOCKET_PING_INTERVAL_SECONDS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment