From 95883c415fc70371a12bea7d762370d4bd3ce088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?shuxin=20=E3=80=80=E3=80=80zheng?= Date: Sat, 15 Feb 2020 19:26:41 +0800 Subject: [PATCH] fixed compiling waring on MacOS --- lib_acl/samples/Makefile.in | 8 ++++---- lib_acl/samples/udp/Makefile.in | 6 +++--- lib_acl_cpp/samples/Makefile.in | 4 ++-- lib_fiber/c.old/Makefile | 6 +++--- lib_fiber/c/Makefile | 2 +- lib_fiber/cpp/Makefile | 2 +- lib_fiber/samples/chat/Makefile.in | 2 +- lib_fiber/samples/test/Makefile.in | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib_acl/samples/Makefile.in b/lib_acl/samples/Makefile.in index 41762dc49..f594c9f44 100644 --- a/lib_acl/samples/Makefile.in +++ b/lib_acl/samples/Makefile.in @@ -35,18 +35,18 @@ endif ifeq ($(findstring clang, $(CC)), clang) CFLAGS += -Wstrict-prototypes \ -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif ifeq ($(findstring clang++, $(CC)), clang) CFLAGS += -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif ifeq ($(findstring gcc, $(CC)), clang++) CFLAGS += -Wstrict-prototypes \ -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif # For FreeBSD @@ -58,7 +58,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof SYSLIB += -rdynamic UNIXTYPE = MACOSX endif diff --git a/lib_acl/samples/udp/Makefile.in b/lib_acl/samples/udp/Makefile.in index ecd655b9e..8cc3e7243 100644 --- a/lib_acl/samples/udp/Makefile.in +++ b/lib_acl/samples/udp/Makefile.in @@ -33,12 +33,12 @@ endif ifeq ($(findstring clang, $(CC)), clang) CFLAGS += -Wstrict-prototypes \ -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif ifeq ($(findstring clang++, $(CC)), clang++) CFLAGS += -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif # For FreeBSD @@ -50,7 +50,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof UNIXTYPE = MACOSX endif diff --git a/lib_acl_cpp/samples/Makefile.in b/lib_acl_cpp/samples/Makefile.in index 92a2e74cd..f9f58a648 100644 --- a/lib_acl_cpp/samples/Makefile.in +++ b/lib_acl_cpp/samples/Makefile.in @@ -35,7 +35,7 @@ endif ifeq ($(findstring clang++, $(CC)), clang++) CFLAGS += -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif # For FreeBSD @@ -48,7 +48,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof SYSLIB += -rdynamic UNIXTYPE = MACOSX RPATH = macos diff --git a/lib_fiber/c.old/Makefile b/lib_fiber/c.old/Makefile index 44e2911ac..de5ca0ea7 100644 --- a/lib_fiber/c.old/Makefile +++ b/lib_fiber/c.old/Makefile @@ -58,12 +58,12 @@ endif ifeq ($(findstring clang, $(CC)), clang) CFLAGS += -Wstrict-prototypes \ -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif ifeq ($(findstring clang++, $(CC)), clang++) CFLAGS += -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif # For FreeBSD @@ -74,7 +74,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof UNIXTYPE = MACOSX endif diff --git a/lib_fiber/c/Makefile b/lib_fiber/c/Makefile index 5f7cb75fc..b752e79f8 100644 --- a/lib_fiber/c/Makefile +++ b/lib_fiber/c/Makefile @@ -88,7 +88,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof \ + -Wno-invalid-offsetof \ -Wno-deprecated-declarations endif diff --git a/lib_fiber/cpp/Makefile b/lib_fiber/cpp/Makefile index ed8887b1a..95883bbcd 100644 --- a/lib_fiber/cpp/Makefile +++ b/lib_fiber/cpp/Makefile @@ -77,7 +77,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof \ + -Wno-invalid-offsetof \ -Wno-unused-private-field UNIXTYPE = MACOSX shared_ldflags = -lacl_cpp -lprotocol -lacl -L/usr/lib -liconv -lz -lpthread diff --git a/lib_fiber/samples/chat/Makefile.in b/lib_fiber/samples/chat/Makefile.in index b5c5e96f3..def470445 100644 --- a/lib_fiber/samples/chat/Makefile.in +++ b/lib_fiber/samples/chat/Makefile.in @@ -32,7 +32,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof UNIXTYPE = MACOSX SYSLIB += -liconv -rdynamic RPATH = macos diff --git a/lib_fiber/samples/test/Makefile.in b/lib_fiber/samples/test/Makefile.in index 866a2915f..a29c0c59a 100644 --- a/lib_fiber/samples/test/Makefile.in +++ b/lib_fiber/samples/test/Makefile.in @@ -36,12 +36,12 @@ endif ifeq ($(findstring clang, $(CC)), clang) CFLAGS += -Wstrict-prototypes \ -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif ifeq ($(findstring clang++, $(CC)), clang++) CFLAGS += -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof endif # For FreeBSD @@ -53,7 +53,7 @@ endif # For Darwin ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin) CFLAGS += -DMACOSX -Wno-invalid-source-encoding \ - -Wno-extended-offsetof + -Wno-invalid-offsetof SYSLIB += -rdynamic UNIXTYPE = MACOSX endif