diff --git a/3rd/lua/makefile b/3rd/lua/makefile index f4a945b6..2b5f76f7 100644 --- a/3rd/lua/makefile +++ b/3rd/lua/makefile @@ -30,7 +30,7 @@ CMCFLAGS= # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= -PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris +PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris openbsd LUA_A= liblua.a CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o @@ -112,7 +112,7 @@ c89: @echo '*** with LUA_USE_C89 to ensure consistency' @echo '' -FreeBSD NetBSD OpenBSD freebsd: +FreeBSD NetBSD OpenBSD freebsd openbsd: $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc" generic: $(ALL) diff --git a/README.md b/README.md index 259b8b13..dbc45605 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ For Linux, install autoconf first for jemalloc: ``` git clone https://github.com/cloudwu/skynet.git cd skynet -make 'PLATFORM' # PLATFORM can be linux, macosx, freebsd now +make 'PLATFORM' # PLATFORM can be linux, macosx, freebsd, openbsd now ``` Or: diff --git a/platform.mk b/platform.mk index d95c45ad..6f041595 100644 --- a/platform.mk +++ b/platform.mk @@ -1,5 +1,5 @@ PLAT ?= none -PLATS = linux freebsd macosx mingw +PLATS = linux freebsd openbsd macosx mingw CC ?= gcc @@ -25,6 +25,7 @@ EXPORT := -Wl,-E linux : PLAT = linux macosx : PLAT = macosx freebsd : PLAT = freebsd +openbsd : PLAT = openbsd mingw : PLAT = mingw macosx : SHARED := -fPIC -dynamiclib -Wl,-undefined,dynamic_lookup @@ -34,10 +35,10 @@ linux freebsd : SKYNET_LIBS += -lrt # Turn off jemalloc and malloc hook on macosx -macosx : MALLOC_STATICLIB := -macosx : SKYNET_DEFINES :=-DNOUSE_JEMALLOC +openbsd macosx : MALLOC_STATICLIB := +openbsd macosx : SKYNET_DEFINES :=-DNOUSE_JEMALLOC -linux macosx freebsd : +linux macosx freebsd openbsd : $(MAKE) all PLAT=$@ SKYNET_LIBS="$(SKYNET_LIBS)" SHARED="$(SHARED)" EXPORT="$(EXPORT)" MALLOC_STATICLIB="$(MALLOC_STATICLIB)" SKYNET_DEFINES="$(SKYNET_DEFINES)" mingw : diff --git a/skynet-src/socket_server.c b/skynet-src/socket_server.c index 8b7c4bd8..8cc6ee36 100644 --- a/skynet-src/socket_server.c +++ b/skynet-src/socket_server.c @@ -6,6 +6,7 @@ #include "spinlock.h" #include +#include #include #include #include