Index: write.c
===================================================================
--- write.c	(revision 7770)
+++ write.c	(revision 7771)
@@ -561,7 +561,7 @@
 	pcb_cardinal_t currentLayer = number;
 
 	/* write information about non empty layers */
-	if (!PCB_LAYER_IS_EMPTY(layer) || (layer->Name && *layer->Name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->Name && *layer->Name)) {
 		/*
 			fprintf(FP, "Layer(%i ", (int) Number + 1);
 			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->Name));
@@ -605,7 +605,7 @@
 	int copperStartY; /* used for mapping geda copper arcs onto kicad copper lines */
 
 	/* write information about non empty layers */
-	if (!PCB_LAYER_IS_EMPTY(layer) || (layer->Name && *layer->Name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->Name && *layer->Name)) {
 		/*
 			fprintf(FP, "Layer(%i ", (int) Number + 1);
 			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->Name));
@@ -683,7 +683,7 @@
 	pcb_cardinal_t currentLayer = number;
 
 	/* write information about non empty layers */
-	if (!PCB_LAYER_IS_EMPTY(layer) || (layer->Name && *layer->Name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->Name && *layer->Name)) {
 		/*
 			fprintf(FP, "Layer(%i ", (int) Number + 1);
 			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->Name));
@@ -1213,7 +1213,7 @@
 	pcb_cardinal_t currentLayer = number;
 
 	/* write information about non empty layers */
-	if (!PCB_LAYER_IS_EMPTY(layer) || (layer->Name && *layer->Name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->Name && *layer->Name)) {
 		int localFlag = 0;
 		polylist_foreach(&layer->Polygon, &it, polygon) {
 			if (polygon->HoleIndexN == 0) { /* no holes defined within polygon, which we implement support for first */