Merge branch 'fix_iostream_include' into plugin_support

Conflicts:
	src/zm_image_analyser.h

src/zm.h

@@ -33,6 +33,8 @@
 
 #include <stdint.h>
 
+#include <iostream>
+
 extern const char* self;
 
 #endif // ZM_H

src/zm_image_analyser.h

@@ -6,7 +6,6 @@
 #include <list>
 #include <string>
 #include <stdexcept>
-#include <iostream>
 #include <fstream>
 #include <memory>
 #include <algorithm>

src/zma.cpp

@@ -72,7 +72,7 @@ int main( int argc, char *argv[] )
 				Usage();
 				break;
 			case 'v':
-				cout << ZM_VERSION << "\n";
+				std::cout << ZM_VERSION << "\n";
 				exit(0);
 			default:
 				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );

src/zmc.cpp

@@ -117,7 +117,7 @@ int main( int argc, char *argv[] )
 				Usage();
 				break;
 			case 'v':
-				cout << ZM_VERSION << "\n";
+				std::cout << ZM_VERSION << "\n";
 				exit(0);
 			default:
 				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );

src/zmf.cpp

@@ -140,7 +140,7 @@ int main( int argc, char *argv[] )
 				Usage();
 				break;
 			case 'v':
-				cout << ZM_VERSION << "\n";
+				std::cout << ZM_VERSION << "\n";
 				exit(0);
 			default:
 				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );

src/zmstreamer.cpp

@@ -104,7 +104,7 @@ int main(int argc, char** argv) {
                 printf("-v : This installed version of ZoneMinder\n");
                 return EXIT_SUCCESS;
             case 'v':
-                cout << ZM_VERSION << "\n";
+                std::cout << ZM_VERSION << "\n";
                 exit(0);
         }
     }