From e3a1573fc97685bfd0621dc4bb89af8050a6e17d Mon Sep 17 00:00:00 2001 From: nila Date: Tue, 24 Mar 2020 12:22:46 +0100 Subject: [PATCH] fix failing vector digitizer on mac (trac 3487) --- lib/python/ctypes/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/python/ctypes/Makefile b/lib/python/ctypes/Makefile index cd324ee7a72..f30c8401116 100644 --- a/lib/python/ctypes/Makefile +++ b/lib/python/ctypes/Makefile @@ -56,9 +56,14 @@ proj_INC = $(PROJINC) vector_INC = $(VECT_INC) $(VECT_CFLAGS) vedit_INC = $(VECT_INC) $(VECT_CFLAGS) +MAC_FLAGS = "" +ifneq ($(findstring darwin,$(ARCH)),) +MAC_FLAGS = "-D_Nullable=" +endif + SED = sed CTYPESGEN = ./ctypesgen.py -CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -D__GLIBC_HAVE_LONG_LONG" +CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(MAC_FLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -D__GLIBC_HAVE_LONG_LONG" EXTRA_CLEAN_FILES := $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc) ifneq ($(MINGW),)