From 4b48c3a77c0c350b0f137a0961094c86a3365f8a Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 4 Sep 2010 18:30:10 +0200 Subject: [PATCH] Fixed: Including windows.h before using WinMain --- code/nel/samples/3d/font/main.cpp | 5 +++++ code/nel/samples/3d/shape_viewer/main.cpp | 5 +++++ code/nel/samples/net/chat/server.cpp | 5 +++++ code/nel/samples/net/class_transport/ai_service.cpp | 5 +++++ code/nel/samples/net/class_transport/gd_service.cpp | 5 +++++ code/nel/samples/net/login_system/frontend_service.cpp | 5 +++++ code/nel/samples/net/udp/bench_service.cpp | 5 +++++ code/ryzom/server/src/ai_service/service_main.cpp | 4 ++++ code/ryzom/server/src/ai_service/stdpch.h | 5 +++++ code/ryzom/server/src/backup_service/backup_service.cpp | 5 +++++ .../src/entities_game_service/entities_game_service.cpp | 5 +++++ code/ryzom/server/src/frontend_service/fe_receive_task.cpp | 4 ++-- code/ryzom/server/src/frontend_service/frontend_service.cpp | 5 +++++ code/ryzom/server/src/gpm_service/gpm_service.cpp | 5 +++++ .../server/src/input_output_service/input_output_service.cpp | 5 +++++ .../server/src/log_analyser_service/log_analyser_service.cpp | 5 +++++ code/ryzom/server/src/logger_service/logger_service.cpp | 5 +++++ .../server/src/mail_forum_service/mail_forum_service.cpp | 4 ++++ code/ryzom/server/src/monitor_service/service_main.cpp | 5 +++++ .../src/pd_reference_builder/reference_builder_service.cpp | 5 +++++ code/ryzom/server/src/pd_support_service/service_main.cpp | 4 ++++ .../src/persistant_data_service/persistant_data_service.cpp | 5 +++++ .../server/src/ryzom_admin_service/ryzom_admin_service.cpp | 5 +++++ .../src/shard_unifier_service/shard_unifier_service.cpp | 5 +++++ code/ryzom/server/src/tick_service/tick_service.cpp | 5 +++++ code/ryzom/tools/patch_gen/patch_gen_service.cpp | 5 +++++ code/ryzom/tools/stats_scan/service_main.cpp | 5 +++++ 27 files changed, 129 insertions(+), 2 deletions(-) diff --git a/code/nel/samples/3d/font/main.cpp b/code/nel/samples/3d/font/main.cpp index 2b59a8336..1a417cae7 100644 --- a/code/nel/samples/3d/font/main.cpp +++ b/code/nel/samples/3d/font/main.cpp @@ -29,6 +29,11 @@ #include "nel/3d/text_context.h" #include "nel/3d/driver_user.h" +#ifdef NL_OS_WINDOWS + #define NOMINMAX + #include +#endif // NL_OS_WINDOWS + #ifndef FONT_DIR # define FONT_DIR "." #endif diff --git a/code/nel/samples/3d/shape_viewer/main.cpp b/code/nel/samples/3d/shape_viewer/main.cpp index dd88b1efe..9b22275b7 100644 --- a/code/nel/samples/3d/shape_viewer/main.cpp +++ b/code/nel/samples/3d/shape_viewer/main.cpp @@ -28,6 +28,11 @@ #include #include +#ifdef NL_OS_WINDOWS + #define NOMINMAX + #include +#endif // NL_OS_WINDOWS + using namespace NLMISC; using namespace NL3D; diff --git a/code/nel/samples/net/chat/server.cpp b/code/nel/samples/net/chat/server.cpp index bccf9e50e..a20fa5827 100644 --- a/code/nel/samples/net/chat/server.cpp +++ b/code/nel/samples/net/chat/server.cpp @@ -23,6 +23,11 @@ #include "nel/net/service.h" #include "nel/net/callback_server.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/nel/samples/net/class_transport/ai_service.cpp b/code/nel/samples/net/class_transport/ai_service.cpp index 1fbf31148..9e818d3ea 100644 --- a/code/nel/samples/net/class_transport/ai_service.cpp +++ b/code/nel/samples/net/class_transport/ai_service.cpp @@ -36,6 +36,11 @@ #include "nel/net/transport_class.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + #ifndef NL_CT_CFG #define NL_CT_CFG "" #endif // NL_CT_CFG diff --git a/code/nel/samples/net/class_transport/gd_service.cpp b/code/nel/samples/net/class_transport/gd_service.cpp index f2cb8e31e..438f2cb55 100644 --- a/code/nel/samples/net/class_transport/gd_service.cpp +++ b/code/nel/samples/net/class_transport/gd_service.cpp @@ -36,6 +36,11 @@ #include "nel/net/transport_class.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + #ifndef NL_CT_CFG #define NL_CT_CFG "" #endif // NL_CT_CFG diff --git a/code/nel/samples/net/login_system/frontend_service.cpp b/code/nel/samples/net/login_system/frontend_service.cpp index 6c3237302..0cfbf04fc 100644 --- a/code/nel/samples/net/login_system/frontend_service.cpp +++ b/code/nel/samples/net/login_system/frontend_service.cpp @@ -33,6 +33,11 @@ #include "nel/net/service.h" #include "nel/net/login_server.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLNET; using namespace NLMISC; diff --git a/code/nel/samples/net/udp/bench_service.cpp b/code/nel/samples/net/udp/bench_service.cpp index dc631f80c..0b8db1a71 100644 --- a/code/nel/samples/net/udp/bench_service.cpp +++ b/code/nel/samples/net/udp/bench_service.cpp @@ -42,6 +42,11 @@ #include "receive_task.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + #ifndef UDP_DIR #define UDP_DIR "" #endif // UDP_DIR diff --git a/code/ryzom/server/src/ai_service/service_main.cpp b/code/ryzom/server/src/ai_service/service_main.cpp index 5cd58683d..ea56726e0 100644 --- a/code/ryzom/server/src/ai_service/service_main.cpp +++ b/code/ryzom/server/src/ai_service/service_main.cpp @@ -37,6 +37,10 @@ #include "ais_user_models.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS //#include "nel/misc/bitmap.h" diff --git a/code/ryzom/server/src/ai_service/stdpch.h b/code/ryzom/server/src/ai_service/stdpch.h index 2a3ef2182..ae82daa14 100644 --- a/code/ryzom/server/src/ai_service/stdpch.h +++ b/code/ryzom/server/src/ai_service/stdpch.h @@ -187,4 +187,9 @@ namespace MULTI_LINE_FORMATER { #include "ai_share/angle.h" #include "ai_share/world_map.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + #endif /*STDPCH_H*/ diff --git a/code/ryzom/server/src/backup_service/backup_service.cpp b/code/ryzom/server/src/backup_service/backup_service.cpp index 9d7aab99d..5e14bbade 100644 --- a/code/ryzom/server/src/backup_service/backup_service.cpp +++ b/code/ryzom/server/src/backup_service/backup_service.cpp @@ -29,6 +29,11 @@ #include "backup_service.h" #include "web_connection.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + // force admin module to link in extern void admin_modules_forceLink(); void foo() diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp index b90feb15f..2ec46637c 100644 --- a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp +++ b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp @@ -126,6 +126,11 @@ #include "server_share/logger_service_client.h" #include "server_share/stl_allocator_checker.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + /////////// // USING // /////////// diff --git a/code/ryzom/server/src/frontend_service/fe_receive_task.cpp b/code/ryzom/server/src/frontend_service/fe_receive_task.cpp index 84833ae08..6b87b214d 100644 --- a/code/ryzom/server/src/frontend_service/fe_receive_task.cpp +++ b/code/ryzom/server/src/frontend_service/fe_receive_task.cpp @@ -22,8 +22,8 @@ #include "fe_types.h" #ifdef NL_OS_WINDOWS - - +# define NOMINMAX +# include #elif defined NL_OS_UNIX #include diff --git a/code/ryzom/server/src/frontend_service/frontend_service.cpp b/code/ryzom/server/src/frontend_service/frontend_service.cpp index ce47e5322..af27047b2 100644 --- a/code/ryzom/server/src/frontend_service/frontend_service.cpp +++ b/code/ryzom/server/src/frontend_service/frontend_service.cpp @@ -56,6 +56,11 @@ #include "id_impulsions.h" #include "uid_impulsions.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace NLNET; using namespace NLMISC; using namespace CLFECOMMON; diff --git a/code/ryzom/server/src/gpm_service/gpm_service.cpp b/code/ryzom/server/src/gpm_service/gpm_service.cpp index eb4b5c3bb..14583f01b 100644 --- a/code/ryzom/server/src/gpm_service/gpm_service.cpp +++ b/code/ryzom/server/src/gpm_service/gpm_service.cpp @@ -48,6 +48,11 @@ #include "client_messages.h" #include "sheets.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + // force admin module to link in extern void admin_modules_forceLink(); void foo() diff --git a/code/ryzom/server/src/input_output_service/input_output_service.cpp b/code/ryzom/server/src/input_output_service/input_output_service.cpp index 43d72d36b..546bc5681 100644 --- a/code/ryzom/server/src/input_output_service/input_output_service.cpp +++ b/code/ryzom/server/src/input_output_service/input_output_service.cpp @@ -46,6 +46,11 @@ #endif */ +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + // force admin module to link in extern void admin_modules_forceLink(); void foo() diff --git a/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp b/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp index c590e4d5a..5ca4c19e1 100644 --- a/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp +++ b/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp @@ -19,6 +19,11 @@ #include #include +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/server/src/logger_service/logger_service.cpp b/code/ryzom/server/src/logger_service/logger_service.cpp index 3dc9467b9..979fde0ba 100644 --- a/code/ryzom/server/src/logger_service/logger_service.cpp +++ b/code/ryzom/server/src/logger_service/logger_service.cpp @@ -35,6 +35,11 @@ #include "log_query.h" #include "log_storage.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp b/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp index 18baa2196..8260ae00a 100644 --- a/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp +++ b/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp @@ -24,6 +24,10 @@ #include "shard_stat_db_manager.h" #include "hof_generator.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS using namespace NLNET; using namespace NLMISC; diff --git a/code/ryzom/server/src/monitor_service/service_main.cpp b/code/ryzom/server/src/monitor_service/service_main.cpp index 10937587b..deb906dcf 100644 --- a/code/ryzom/server/src/monitor_service/service_main.cpp +++ b/code/ryzom/server/src/monitor_service/service_main.cpp @@ -27,6 +27,11 @@ #include "mirrors.h" #include "messages.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + #include using namespace NLMISC; diff --git a/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp b/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp index e8be460b0..7000ef174 100644 --- a/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp +++ b/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp @@ -20,6 +20,11 @@ #include "ref_builder_task.h" #include "delta_builder_task.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/server/src/pd_support_service/service_main.cpp b/code/ryzom/server/src/pd_support_service/service_main.cpp index 000d102cd..b7a40fd68 100644 --- a/code/ryzom/server/src/pd_support_service/service_main.cpp +++ b/code/ryzom/server/src/pd_support_service/service_main.cpp @@ -33,6 +33,10 @@ // local #include "service_main.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS //----------------------------------------------------------------------------- // force admin module to link in diff --git a/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp b/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp index 04e081eab..84abfe014 100644 --- a/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp +++ b/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp @@ -18,6 +18,11 @@ #include "db_manager.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp b/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp index 9b1654cb3..4ef254d8e 100644 --- a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp +++ b/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp @@ -21,6 +21,11 @@ #include "nel/net/service.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp b/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp index da6729244..393c0a175 100644 --- a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp +++ b/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp @@ -23,6 +23,11 @@ #include //#include +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/server/src/tick_service/tick_service.cpp b/code/ryzom/server/src/tick_service/tick_service.cpp index 0d0c0b34c..558f62d56 100644 --- a/code/ryzom/server/src/tick_service/tick_service.cpp +++ b/code/ryzom/server/src/tick_service/tick_service.cpp @@ -30,6 +30,11 @@ #include "tick_service.h" #include +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/tools/patch_gen/patch_gen_service.cpp b/code/ryzom/tools/patch_gen/patch_gen_service.cpp index 71332478b..063482fd0 100644 --- a/code/ryzom/tools/patch_gen/patch_gen_service.cpp +++ b/code/ryzom/tools/patch_gen/patch_gen_service.cpp @@ -25,6 +25,11 @@ #include "patch_gen_service.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/tools/stats_scan/service_main.cpp b/code/ryzom/tools/stats_scan/service_main.cpp index 0592e55c6..40e4c3611 100644 --- a/code/ryzom/tools/stats_scan/service_main.cpp +++ b/code/ryzom/tools/stats_scan/service_main.cpp @@ -25,6 +25,11 @@ #include "game_share/tick_event_handler.h" #include "game_share/singleton_registry.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace std; using namespace NLMISC; using namespace NLNET;