Fixed: Including windows.h before using WinMain

This commit is contained in:
kervala 2010-09-04 18:30:10 +02:00
parent 4e2d50d28c
commit 2e2792cb74
27 changed files with 129 additions and 2 deletions

View file

@ -29,6 +29,11 @@
#include "nel/3d/text_context.h" #include "nel/3d/text_context.h"
#include "nel/3d/driver_user.h" #include "nel/3d/driver_user.h"
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <windows.h>
#endif // NL_OS_WINDOWS
#ifndef FONT_DIR #ifndef FONT_DIR
# define FONT_DIR "." # define FONT_DIR "."
#endif #endif

View file

@ -28,6 +28,11 @@
#include <nel/3d/u_driver.h> #include <nel/3d/u_driver.h>
#include <nel/3d/u_instance.h> #include <nel/3d/u_instance.h>
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <windows.h>
#endif // NL_OS_WINDOWS
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;

View file

@ -23,6 +23,11 @@
#include "nel/net/service.h" #include "nel/net/service.h"
#include "nel/net/callback_server.h" #include "nel/net/callback_server.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -36,6 +36,11 @@
#include "nel/net/transport_class.h" #include "nel/net/transport_class.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
#ifndef NL_CT_CFG #ifndef NL_CT_CFG
#define NL_CT_CFG "" #define NL_CT_CFG ""
#endif // NL_CT_CFG #endif // NL_CT_CFG

View file

@ -36,6 +36,11 @@
#include "nel/net/transport_class.h" #include "nel/net/transport_class.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
#ifndef NL_CT_CFG #ifndef NL_CT_CFG
#define NL_CT_CFG "" #define NL_CT_CFG ""
#endif // NL_CT_CFG #endif // NL_CT_CFG

View file

@ -33,6 +33,11 @@
#include "nel/net/service.h" #include "nel/net/service.h"
#include "nel/net/login_server.h" #include "nel/net/login_server.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLNET; using namespace NLNET;
using namespace NLMISC; using namespace NLMISC;

View file

@ -42,6 +42,11 @@
#include "receive_task.h" #include "receive_task.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
#ifndef UDP_DIR #ifndef UDP_DIR
#define UDP_DIR "" #define UDP_DIR ""
#endif // UDP_DIR #endif // UDP_DIR

View file

@ -37,6 +37,10 @@
#include "ais_user_models.h" #include "ais_user_models.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
//#include "nel/misc/bitmap.h" //#include "nel/misc/bitmap.h"

View file

@ -187,4 +187,9 @@ namespace MULTI_LINE_FORMATER {
#include "ai_share/angle.h" #include "ai_share/angle.h"
#include "ai_share/world_map.h" #include "ai_share/world_map.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
#endif /*STDPCH_H*/ #endif /*STDPCH_H*/

View file

@ -29,6 +29,11 @@
#include "backup_service.h" #include "backup_service.h"
#include "web_connection.h" #include "web_connection.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
// force admin module to link in // force admin module to link in
extern void admin_modules_forceLink(); extern void admin_modules_forceLink();
void foo() void foo()

View file

@ -126,6 +126,11 @@
#include "server_share/logger_service_client.h" #include "server_share/logger_service_client.h"
#include "server_share/stl_allocator_checker.h" #include "server_share/stl_allocator_checker.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
/////////// ///////////
// USING // // USING //
/////////// ///////////

View file

@ -22,8 +22,8 @@
#include "fe_types.h" #include "fe_types.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#elif defined NL_OS_UNIX #elif defined NL_OS_UNIX
#include <unistd.h> #include <unistd.h>

View file

@ -56,6 +56,11 @@
#include "id_impulsions.h" #include "id_impulsions.h"
#include "uid_impulsions.h" #include "uid_impulsions.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace NLNET; using namespace NLNET;
using namespace NLMISC; using namespace NLMISC;
using namespace CLFECOMMON; using namespace CLFECOMMON;

View file

@ -48,6 +48,11 @@
#include "client_messages.h" #include "client_messages.h"
#include "sheets.h" #include "sheets.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
// force admin module to link in // force admin module to link in
extern void admin_modules_forceLink(); extern void admin_modules_forceLink();
void foo() void foo()

View file

@ -46,6 +46,11 @@
#endif #endif
*/ */
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
// force admin module to link in // force admin module to link in
extern void admin_modules_forceLink(); extern void admin_modules_forceLink();
void foo() void foo()

View file

@ -19,6 +19,11 @@
#include <nel/misc/log.h> #include <nel/misc/log.h>
#include <nel/misc/variable.h> #include <nel/misc/variable.h>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -35,6 +35,11 @@
#include "log_query.h" #include "log_query.h"
#include "log_storage.h" #include "log_storage.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -24,6 +24,10 @@
#include "shard_stat_db_manager.h" #include "shard_stat_db_manager.h"
#include "hof_generator.h" #include "hof_generator.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace NLNET; using namespace NLNET;
using namespace NLMISC; using namespace NLMISC;

View file

@ -27,6 +27,11 @@
#include "mirrors.h" #include "mirrors.h"
#include "messages.h" #include "messages.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
#include <mysql.h> #include <mysql.h>
using namespace NLMISC; using namespace NLMISC;

View file

@ -20,6 +20,11 @@
#include "ref_builder_task.h" #include "ref_builder_task.h"
#include "delta_builder_task.h" #include "delta_builder_task.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -33,6 +33,10 @@
// local // local
#include "service_main.h" #include "service_main.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// force admin module to link in // force admin module to link in

View file

@ -18,6 +18,11 @@
#include "db_manager.h" #include "db_manager.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -21,6 +21,11 @@
#include "nel/net/service.h" #include "nel/net/service.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -23,6 +23,11 @@
#include <time.h> #include <time.h>
//#include <sys/utime.h> //#include <sys/utime.h>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -30,6 +30,11 @@
#include "tick_service.h" #include "tick_service.h"
#include <string> #include <string>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -25,6 +25,11 @@
#include "patch_gen_service.h" #include "patch_gen_service.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;

View file

@ -25,6 +25,11 @@
#include "game_share/tick_event_handler.h" #include "game_share/tick_event_handler.h"
#include "game_share/singleton_registry.h" #include "game_share/singleton_registry.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;