From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 7 Mar 2014 03:26:18 +0000 (+0000)
Subject: Remove conditional compilation switches for embedded use, we have the size
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=8e2c1a7bc1795544c90651d6911ffc731f90283f;p=freetel-svn-tracking.git

Remove conditional compilation switches for embedded use, we have the size
small enough now (with removal of STL template use) that we don't need them.


git-svn-id: https://svn.code.sf.net/p/freetel/code@1414 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/freedv-server/source/audio_sink.cpp b/freedv-server/source/audio_sink.cpp
index 7d29b99c..1715ae20 100644
--- a/freedv-server/source/audio_sink.cpp
+++ b/freedv-server/source/audio_sink.cpp
@@ -1,7 +1,6 @@
 /// The AudioSink driver, called as "sink", discards the audio, for testing.
 
 #include "drivers.h"
-#include <climits>
 
 namespace FreeDV {
   /// Audio output "sink", discards the audio, for testing.
@@ -50,8 +49,6 @@ namespace FreeDV {
     return SIZE_MAX;
   }
 
-#ifndef NO_INITIALIZERS
-
   static bool
   initializer()
   {
@@ -59,5 +56,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/big_main.cpp b/freedv-server/source/big_main.cpp
index 89bc225e..24a43324 100644
--- a/freedv-server/source/big_main.cpp
+++ b/freedv-server/source/big_main.cpp
@@ -7,8 +7,6 @@
 /// can to be without side-effects, a style inherited from functional
 /// programming. Thus, the excessive use of "const". - Bruce
 
-#ifndef NO_INITIALIZERS
-
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
@@ -192,4 +190,3 @@ main(int argc, char * * argv)
   set_scheduler();
   return run(&i);
 }
-#endif
diff --git a/freedv-server/source/blank_panel.cpp b/freedv-server/source/blank_panel.cpp
index f45a2f5f..cf87b759 100644
--- a/freedv-server/source/blank_panel.cpp
+++ b/freedv-server/source/blank_panel.cpp
@@ -37,7 +37,6 @@ namespace FreeDV {
     return new ::FreeDV::BlankPanel(parameter, interfaces);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -45,5 +44,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/codec_noop.cpp b/freedv-server/source/codec_noop.cpp
index ac8315c6..b0c6fd3b 100644
--- a/freedv-server/source/codec_noop.cpp
+++ b/freedv-server/source/codec_noop.cpp
@@ -108,7 +108,6 @@ namespace FreeDV {
     return new ::FreeDV::CodecNoOp(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -116,5 +115,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/framer_noop.cpp b/freedv-server/source/framer_noop.cpp
index 6bb3d951..1c67e5c5 100644
--- a/freedv-server/source/framer_noop.cpp
+++ b/freedv-server/source/framer_noop.cpp
@@ -149,7 +149,6 @@ namespace FreeDV {
     return new ::FreeDV::FramerNoOp(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -157,5 +156,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/keying_sink.cpp b/freedv-server/source/keying_sink.cpp
index dee32c5e..f1008013 100644
--- a/freedv-server/source/keying_sink.cpp
+++ b/freedv-server/source/keying_sink.cpp
@@ -50,7 +50,6 @@ namespace FreeDV {
     return new ::FreeDV::KeyingSink(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -58,5 +57,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/libevent.cpp b/freedv-server/source/libevent.cpp
index 846b8a2e..7bf1b8ce 100644
--- a/freedv-server/source/libevent.cpp
+++ b/freedv-server/source/libevent.cpp
@@ -69,7 +69,6 @@ namespace FreeDV {
   {
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -77,5 +76,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/modem_noop.cpp b/freedv-server/source/modem_noop.cpp
index edba20e6..a87ba667 100644
--- a/freedv-server/source/modem_noop.cpp
+++ b/freedv-server/source/modem_noop.cpp
@@ -116,7 +116,6 @@ namespace FreeDV {
     return new ::FreeDV::ModemNoOp(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -124,5 +123,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/ptt_constant.cpp b/freedv-server/source/ptt_constant.cpp
index f04527a8..cf3ca4de 100644
--- a/freedv-server/source/ptt_constant.cpp
+++ b/freedv-server/source/ptt_constant.cpp
@@ -69,7 +69,6 @@ namespace FreeDV {
     return new ::FreeDV::PTTConstant(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -77,5 +76,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/text_constant.cpp b/freedv-server/source/text_constant.cpp
index 1185b304..8acbb3f3 100644
--- a/freedv-server/source/text_constant.cpp
+++ b/freedv-server/source/text_constant.cpp
@@ -64,7 +64,6 @@ namespace FreeDV {
     return new ::FreeDV::TextConstant(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -72,5 +71,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }
diff --git a/freedv-server/source/tiny_main.cpp b/freedv-server/source/tiny_main.cpp
index ef2029db..f57a70bc 100644
--- a/freedv-server/source/tiny_main.cpp
+++ b/freedv-server/source/tiny_main.cpp
@@ -1,7 +1,5 @@
 /// The tiny main program for embedded use.
 
-#ifdef NO_INITIALIZERS
 /*
  * Main program for embedded use.
  */
-#endif
diff --git a/freedv-server/source/tone.cpp b/freedv-server/source/tone.cpp
index edcf43de..bfb69511 100644
--- a/freedv-server/source/tone.cpp
+++ b/freedv-server/source/tone.cpp
@@ -152,7 +152,6 @@ namespace FreeDV {
     return new ::FreeDV::Tone(parameter);
   }
 
-#ifndef NO_INITIALIZERS
   static bool
   initializer()
   {
@@ -160,5 +159,4 @@ namespace FreeDV {
     return true;
   }
   static const bool initialized = initializer();
-#endif
 }