From 8670da5d6293a3bf1e7bc637de265a9609a1751c Mon Sep 17 00:00:00 2001 From: Vincent Wei Date: Wed, 22 Jan 2020 14:04:39 +0800 Subject: [PATCH] fix conditional compilation errors --- src/server/layer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/layer.c b/src/server/layer.c index 6f693e83..3ec440bf 100644 --- a/src/server/layer.c +++ b/src/server/layer.c @@ -739,7 +739,9 @@ const ZNODEHEADER* GUIAPI ServerGetZNodeHeader (MG_Layer* layer, ZORDERINFO* zi; ZORDERNODE* nodes; ZNODEHEADER* hdr; +#ifdef _MGSCHEMA_COMPOSITING PDC pdc; +#endif if (layer == NULL) layer = mgTopmostLayer; @@ -775,7 +777,7 @@ const ZNODEHEADER* GUIAPI ServerGetZNodeHeader (MG_Layer* layer, } #endif /* defined _MGSCHEMA_COMPOSITING */ - return NULL; + return hdr; } int GUIAPI ServerGetPopupMenusCount (void) @@ -791,7 +793,9 @@ const ZNODEHEADER* GUIAPI ServerGetPopupMenuZNodeHeader (int idx, BOOL lock) ZORDERINFO* zi; ZORDERNODE* menu_nodes; ZNODEHEADER* hdr; +#ifdef _MGSCHEMA_COMPOSITING PDC pdc; +#endif zi = (ZORDERINFO*)mgTopmostLayer->zorder_info;