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 7d29b99cddd092e12948394b9d7f8e1f09b3faf1..1715ae20db726038c07b74caf7e16e9c79d27de9 100644 (file)
--- 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 89bc225e0ec66f2ebd5d2052a98332f83b9ec81a..24a433249c3e2193f48210596aefe2f9b396d682 100644 (file)
--- 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 f45a2f5fd4d4456588b4ac8d3e5ed015c2ace264..cf87b7596127473aa2ee83b8fce1e0eea52ed1cc 100644 (file)
--- 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 ac8315c68365794dd438c2fa504e1709301e3462..b0c6fd3b4a21ca2e43d38ed458b25926274d2b54 100644 (file)
--- 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 6bb3d9511b3c595caabd9a38dfd7e0b1c0c3bb50..1c67e5c5b40f6d80a1dc24356309955ac94ef334 100644 (file)
--- 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 dee32c5e9d5138b9117fdd0a535d016c9a9568ef..f100801362c6581fcc9cb49500ef82a3866a6db7 100644 (file)
--- 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 846b8a2e6d02498dad67a135279b750187ea5541..7bf1b8ceacc04c9e99a27ab4fcddc94ef9c85adf 100644 (file)
--- 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 edba20e684b20758a044e0d7efd825789939ba2d..a87ba6673f294f7ab3b24813fb56fd56a2cd0e76 100644 (file)
--- 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 f04527a8ddda74766ee788dd330d15fd377c72b5..cf3ca4de529d3d6d04f49419a75b4a88dba46cba 100644 (file)
--- 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 1185b304bc4ae4aa1c80045ff208cfcb566f591e..8acbb3f395b7e00feff8a6589510dc136166bc72 100644 (file)
--- 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 ef2029db7441cd0e25bb82162b9958b67dbb4fa1..f57a70bcf03803e4758861b3c1d9db10509659ea 100644 (file)
--- 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 edcf43def811d17d1881d8af81bdc49d07a494a8..bfb6951150f47f0ac916cc6a0d36ec4611f3b965 100644 (file)
--- 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
 }