summaryrefslogtreecommitdiff
path: root/users.h
diff options
context:
space:
mode:
authorJasmin Jessich <jasmin@anw.at>2017-05-20 22:50:00 (GMT)
committerJasmin Jessich <jasmin@anw.at>2017-05-20 22:50:00 (GMT)
commit5f457e6d67133e2b7e7269efedbbe758227b44e3 (patch)
tree2fdfbe897a786fa9c4a3983bbefdd86e175b82e7 /users.h
parentc2761cb4a8e93434470c1c6cac15b950413e1add (diff)
downloadvdr-plugin-live-5f457e6d67133e2b7e7269efedbbe758227b44e3.tar.gz
vdr-plugin-live-5f457e6d67133e2b7e7269efedbbe758227b44e3.tar.bz2
Include file re-ordering
- Reorder all included header files to this order: * own headers * STL headers * VDR headers * system headers This has been done in all source and all own header files. Normally the STL headers should have gone after the VDR headers, but due to an compilation error with GCC 6 and the definition of swap in vdr/tools.h if __STL_CONFIG_H is not defined, the STL headers need to be before the VDR headers. Please note, that GCC 4.x, 5.x and 6.x do no longer define __STL_CONFIG_H resulting in the definition of swap in vdr/tools.h. This was no problem till GCC 6.x. To overcome the error in GCC 6.x, __STL_CONFIG_H is now defined in some headers before including a VDR header file, so that vdr/tools.h doe not define swap any more. Klaus S. might change the definition in vdr/tools.h with the next VDR version. So the setting of "__STL_CONFIG_H" may be removed. - Added all missing system/STL/VDR header files to the own header files, so that they can be included as first file. - Removed all unnecessary header file includes in source and own header files. - Used #include "..." only for header files in the same directory and #include <...> for all header files which need to be searched via the -I and built in path.
Diffstat (limited to 'users.h')
-rw-r--r--users.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/users.h b/users.h
index fe4a0b0..40d87a1 100644
--- a/users.h
+++ b/users.h
@@ -1,11 +1,11 @@
#ifndef VDR_LIVE_USERS_H
#define VDR_LIVE_USERS_H
+// STL headers need to be before VDR tools.h (included by <vdr/channels.h>)
#include <string>
-#include <vdr/plugin.h>
+
#include <vdr/tools.h>
-#include <iostream>
-#include <sstream>
+#include <vdr/config.h>
namespace vdrlive {