Remove some old _WIN32 ifdefs, restructure includes

1 files changed, 4 insertions, 13 deletions

diff --git a/src/Eti.cpp b/src/Eti.cpp
index e1b51fb..2f26f2d 100644
--- a/src/Eti.cpp
+++ b/src/Eti.cpp
@@ -22,19 +22,10 @@
    along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
    */
 
-#ifdef _WIN32
-#   pragma warning ( disable : 4103 )
-#   include "Eti.h"
-#   pragma warning ( default : 4103 )
-#else
-#   include "Eti.h"
-#   include <time.h>
-#endif
-
+#include "Eti.h"
 
 //definitions des structures des champs du ETI(NI, G703)
 
-
 unsigned short eti_FC::getFrameLength()
 {
     return (unsigned short)((FL_high << 8) | FL_low);
@@ -80,7 +71,7 @@ void eti_MNSC_TIME_1::setFromTime(struct tm *time_tm)
 {
     second_unit = time_tm->tm_sec % 10;
     second_tens = time_tm->tm_sec / 10;
-    
+
     minute_unit = time_tm->tm_min % 10;
     minute_tens = time_tm->tm_min / 10;
 }
@@ -89,7 +80,7 @@ void eti_MNSC_TIME_2::setFromTime(struct tm *time_tm)
 {
     hour_unit = time_tm->tm_hour % 10;
     hour_tens = time_tm->tm_hour / 10;
-    
+
     day_unit = time_tm->tm_mday % 10;
     day_tens = time_tm->tm_mday / 10;
 }
@@ -98,7 +89,7 @@ void eti_MNSC_TIME_3::setFromTime(struct tm *time_tm)
 {
     month_unit = (time_tm->tm_mon + 1) % 10;
     month_tens = (time_tm->tm_mon + 1) / 10;
-    
+
     // They didn't see the y2k bug coming, did they ?
     year_unit = (time_tm->tm_year - 100) % 10;
     year_tens = (time_tm->tm_year - 100) / 10;