- fix compilation problems on windows with certain configurations

src/iec61850/server/impl/ied_server.c

@@ -1275,9 +1275,9 @@ checkForChangedTriggers(IedServer self, DataAttribute* dataAttribute)
 #if (CONFIG_IEC61850_REPORT_SERVICE == 1) || (CONFIG_INCLUDE_GOOSE_SUPPORT == 1)
     if (dataAttribute->triggerOptions & TRG_OPT_DATA_CHANGED) {
 
-#if (CONFIG_INCLUDE_GOOSE_SUPPORT == 1)
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
         MmsMapping_triggerGooseObservers(self->mmsMapping, dataAttribute->mmsValue);
-#endif
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
 
 #if (CONFIG_IEC61850_REPORT_SERVICE == 1)
         MmsMapping_triggerReportObservers(self->mmsMapping, dataAttribute->mmsValue,
@@ -1292,9 +1292,9 @@ checkForChangedTriggers(IedServer self, DataAttribute* dataAttribute)
 
     else if (dataAttribute->triggerOptions & TRG_OPT_QUALITY_CHANGED) {
 
-#if (CONFIG_INCLUDE_GOOSE_SUPPORT == 1)
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
         MmsMapping_triggerGooseObservers(self->mmsMapping, dataAttribute->mmsValue);
-#endif
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
 
 #if (CONFIG_IEC61850_REPORT_SERVICE == 1)
         MmsMapping_triggerReportObservers(self->mmsMapping, dataAttribute->mmsValue,
@@ -1616,9 +1616,9 @@ IedServer_updateQuality(IedServer self, DataAttribute* dataAttribute, Quality qu
         Semaphore_post(self->dataModelLock);
 #endif
 
-#if (CONFIG_INCLUDE_GOOSE_SUPPORT == 1)
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
         MmsMapping_triggerGooseObservers(self->mmsMapping, dataAttribute->mmsValue);
-#endif
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
 
 #if (CONFIG_IEC61850_REPORT_SERVICE == 1)
         if (dataAttribute->triggerOptions & TRG_OPT_QUALITY_CHANGED)

src/iec61850/server/mms_mapping/mms_goose.c

@@ -296,8 +296,10 @@ MmsGooseControlBlock_destroy(MmsGooseControlBlock self)
         Semaphore_destroy(self->publisherMutex);
 #endif
 
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
         if (self->publisher)
             GoosePublisher_destroy(self->publisher);
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
 
         if (self->dataSetValues)
             LinkedList_destroyStatic(self->dataSetValues);
@@ -501,10 +503,14 @@ MmsGooseControlBlock_enable(MmsGooseControlBlock self, MmsMapping* mmsMapping)
 
                 if (mmsMapping->useIntegratedPublisher)
                 {
+#if (CONFIG_IEC61850_L2_GOOSE == 1)
                     if (self->gooseInterfaceId)
                         self->publisher = GoosePublisher_createEx(&commParameters, self->gooseInterfaceId, self->useVlanTag);
                     else
                         self->publisher = GoosePublisher_createEx(&commParameters, self->mmsMapping->gooseInterfaceId, self->useVlanTag);
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1) */
+
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
 
                     if (self->publisher)
                     {
@@ -544,6 +550,8 @@ MmsGooseControlBlock_enable(MmsGooseControlBlock self, MmsMapping* mmsMapping)
                         if (DEBUG_IED_SERVER)
                             printf("IED_SERVER: Failed to create GOOSE publisher!\n");
                     }
+
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
                 }
 
                 self->goEna = true;
@@ -585,6 +593,8 @@ MmsGooseControlBlock_disable(MmsGooseControlBlock self, MmsMapping* mmsMapping)
         Semaphore_wait(self->publisherMutex);
 #endif
 
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
+
         if (mmsMapping->useIntegratedPublisher)
         {
             if (self->publisher)
@@ -596,6 +606,8 @@ MmsGooseControlBlock_disable(MmsGooseControlBlock self, MmsMapping* mmsMapping)
             }
         }
 
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
+
 #if (CONFIG_IEC61850_SERVICE_TRACKING == 1)
         MmsDataAccessError retVal = DATA_ACCESS_ERROR_SUCCESS;
         copyGCBValuesToTrackingObject(self);
@@ -623,6 +635,8 @@ MmsGooseControlBlock_checkAndPublish(MmsGooseControlBlock self, uint64_t current
                 Semaphore_wait(self->publisherMutex);
 #endif
 
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
+
                 GoosePublisher_publish(self->publisher, self->dataSetValues);
 
                 if (self->retransmissionsLeft > 0)
@@ -643,6 +657,8 @@ MmsGooseControlBlock_checkAndPublish(MmsGooseControlBlock self, uint64_t current
                     self->nextPublishTime = currentTime + self->maxTime;
                 }
 
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
+
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
                 Semaphore_post(self->publisherMutex);
 #endif
@@ -667,6 +683,8 @@ MmsGooseControlBlock_setStateChangePending(MmsGooseControlBlock self)
 void
 MmsGooseControlBlock_publishNewState(MmsGooseControlBlock self)
 {
+#if (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1)
+
     if (self->publisher == false)
         return;
 
@@ -701,6 +719,8 @@ MmsGooseControlBlock_publishNewState(MmsGooseControlBlock self)
         Semaphore_post(self->publisherMutex);
 #endif
     }
+
+#endif /* (CONFIG_IEC61850_L2_GOOSE == 1 || CONFIG_IEC61850_R_GOOSE == 1) */
 }
 
 static MmsVariableSpecification*