compilation fix

13 files changed, 24 insertions, 24 deletions

diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp
index 599c148faa..fa0fa3cc8d 100644
--- a/plugins/MirFox/src/MirandaUtils.cpp
+++ b/plugins/MirFox/src/MirandaUtils.cpp
@@ -30,9 +30,9 @@ void MirandaUtils::netlibLog_int(const wchar_t* szText) {
 void MirandaUtils::netlibRegister() {

 	// Register netlib user for logging function

 	NETLIBUSER nlu = {};

-	nlu.flags = NUF_UNICODE | NUF_NOOPTIONS;

+	nlu.flags = NUF_NOOPTIONS;

 	nlu.szSettingsModule = MODULENAME;

-	nlu.szDescriptiveName.w = MODULENAME;

+	nlu.szDescriptiveName.a = MODULENAME;

 

 	netlibHandle = Netlib_RegisterUser(&nlu);

 }

diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp
index 384498b98c..c64ae5bba2 100644
--- a/plugins/PackUpdater/Src/Utils.cpp
+++ b/plugins/PackUpdater/Src/Utils.cpp
@@ -49,8 +49,8 @@ void IcoLibInit()
 BOOL NetlibInit()

 {

 	NETLIBUSER nlu = {};

-	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE;

-	nlu.szDescriptiveName.w = MODULENAME;

+	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS;

+	nlu.szDescriptiveName.a = MODULENAME;

 	nlu.szSettingsModule = MODULENAME;

 	hNetlibUser = Netlib_RegisterUser(&nlu);

 

diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp
index ec291aae07..9b757bb450 100644
--- a/plugins/PasteIt/src/PasteIt.cpp
+++ b/plugins/PasteIt/src/PasteIt.cpp
@@ -352,9 +352,9 @@ int CMPlugin::Load()
 	g_plugin.registerIcon(LPGEN("Paste It"), iconList);

 

 	NETLIBUSER nlu = {};

-	nlu.flags = NUF_UNICODE | NUF_OUTGOING | NUF_HTTPCONNS;

+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS;

 	nlu.szSettingsModule = MODULENAME;

-	nlu.szDescriptiveName.w = MODULENAME;

+	nlu.szDescriptiveName.a = MODULENAME;

 	g_hNetlibUser = Netlib_RegisterUser(&nlu);

 

 	pasteToWebs[0] = new PasteToWeb1();

diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp
index cf570d9076..197866edef 100644
--- a/plugins/PluginUpdater/src/PluginUpdater.cpp
+++ b/plugins/PluginUpdater/src/PluginUpdater.cpp
@@ -96,8 +96,8 @@ int CMPlugin::Load()
 

 	// Netlib initialization

 	NETLIBUSER nlu = {};

-	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE;

-	nlu.szDescriptiveName.w = MODULENAME;

+	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS;

+	nlu.szDescriptiveName.a = MODULENAME;

 	nlu.szSettingsModule = MODULENAME;

 	g_hNetlibUser = Netlib_RegisterUser(&nlu);

 

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 1807303205..7cae004c7a 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -210,8 +210,8 @@ int hook_ModulesLoaded(WPARAM, LPARAM)
 	// Netlib register
 	NETLIBUSER nlu = {};
 	nlu.szSettingsModule = __PLUGIN_NAME;
-	nlu.szDescriptiveName.w = __PLUGIN_NAME;
-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;			//|NUF_NOHTTPSOPTION;
+	nlu.szDescriptiveName.a = __PLUGIN_NAME;
+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS;			//|NUF_NOHTTPSOPTION;
 	g_hNetlibUser = Netlib_RegisterUser(&nlu);
 
 	// load my button class / or use UInfoEx
diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp
index 85e65a536c..f6a02f1643 100644
--- a/plugins/SmileyAdd/src/download.cpp
+++ b/plugins/SmileyAdd/src/download.cpp
@@ -226,9 +226,9 @@ int FolderChanged(WPARAM, LPARAM)
 void DownloadInit(void)

 {

 	NETLIBUSER nlu = {};

-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;

+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION;

 	nlu.szSettingsModule = MODULENAME;

-	nlu.szDescriptiveName.w = MODULENAME;

+	nlu.szDescriptiveName.a = MODULENAME;

 	hNetlibUser = Netlib_RegisterUser(&nlu);

 

 	hFolderPacks = FoldersRegisterCustomPathW(LPGEN("SmileyAdd"), LPGEN("Smiley packs' folder"), L"%miranda_path%");

diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp
index e6792ff2a7..89d7b28d81 100755
--- a/plugins/Watrack_MPD/src/init.cpp
+++ b/plugins/Watrack_MPD/src/init.cpp
@@ -48,8 +48,8 @@ CMPlugin::CMPlugin() :
 static int OnModulesLoaded(WPARAM, LPARAM)

 {

 	NETLIBUSER nlu = {};

-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;

-	nlu.szDescriptiveName.w = __PLUGIN_NAME;

+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS;

+	nlu.szDescriptiveName.a = __PLUGIN_NAME;

 	nlu.szSettingsModule = __PLUGIN_NAME;

 	ghNetlibUser = Netlib_RegisterUser(&nlu);

 

diff --git a/protocols/CurrencyRates/src/HTTPSession.cpp b/protocols/CurrencyRates/src/HTTPSession.cpp
index 6fbee42c34..eb7ffd26ab 100644
--- a/protocols/CurrencyRates/src/HTTPSession.cpp
+++ b/protocols/CurrencyRates/src/HTTPSession.cpp
@@ -80,9 +80,9 @@ bool CHTTPSession::Init()
 		Miranda_WaitOnHandle(waitStub);
 
 	NETLIBUSER nlu = {};
-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;
+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION;
 	nlu.szSettingsModule = MODULENAME;
-	nlu.szDescriptiveName.w = MODULENAME;
+	nlu.szDescriptiveName.a = MODULENAME;
 	g_hNetLib = Netlib_RegisterUser(&nlu);
 	return (nullptr != g_hNetLib);
 }
diff --git a/protocols/GmailNotifier/src/main.cpp b/protocols/GmailNotifier/src/main.cpp
index 98b6071fbc..5eaf78108d 100644
--- a/protocols/GmailNotifier/src/main.cpp
+++ b/protocols/GmailNotifier/src/main.cpp
@@ -89,9 +89,9 @@ int CMPlugin::Load()
 	HookEvent(ME_CLIST_DOUBLECLICKED, OpenBrowser);
 
 	NETLIBUSER nlu = {};
-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;
+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION;
 	nlu.szSettingsModule = MODULENAME;
-	nlu.szDescriptiveName.w = MODULENAME;
+	nlu.szDescriptiveName.a = MODULENAME;
 	hNetlibUser = Netlib_RegisterUser(&nlu);
 
 	CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, GetCaps);
diff --git a/protocols/NewsAggregator/Src/Utils.cpp b/protocols/NewsAggregator/Src/Utils.cpp
index 11722b0d0f..50f21c817b 100644
--- a/protocols/NewsAggregator/Src/Utils.cpp
+++ b/protocols/NewsAggregator/Src/Utils.cpp
@@ -32,8 +32,8 @@ bool IsMyContact(MCONTACT hContact)
 void NetlibInit()
 {
 	NETLIBUSER nlu = {};
-	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE;
-	nlu.szDescriptiveName.w = MODULENAME;
+	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS;
+	nlu.szDescriptiveName.a = MODULENAME;
 	nlu.szSettingsModule = MODULENAME;
 	hNetlibUser = Netlib_RegisterUser(&nlu);
 }
diff --git a/protocols/Weather/src/weather_http.cpp b/protocols/Weather/src/weather_http.cpp
index 248f183fdb..a306315011 100644
--- a/protocols/Weather/src/weather_http.cpp
+++ b/protocols/Weather/src/weather_http.cpp
@@ -137,8 +137,8 @@ int InternetDownloadFile(char *szUrl, char *cookie, char *userAgent, wchar_t **s
 void NetlibInit(void)
 {
 	NETLIBUSER nlu = {};
-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;
+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION;
 	nlu.szSettingsModule = MODULENAME;
-	nlu.szDescriptiveName.w = MODULENAME;
+	nlu.szDescriptiveName.a = MODULENAME;
 	hNetlibUser = Netlib_RegisterUser(&nlu);
 }
diff --git a/protocols/YAMN/src/proto/netlib.cpp b/protocols/YAMN/src/proto/netlib.cpp
index a2f924294e..34366fa734 100644
--- a/protocols/YAMN/src/proto/netlib.cpp
+++ b/protocols/YAMN/src/proto/netlib.cpp
@@ -31,7 +31,7 @@ void __stdcall	SSL_DebugLog(const char *fmt, ...)
 	va_end(vararg);
 }
 
-HANDLE RegisterNLClient(const char *name)
+HANDLE RegisterNLClient(char *name)
 {
 	#ifdef DEBUG_COMM
 	DebugLog(CommFile, "<Register PROXY support>");
diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.cpp b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
index 4d5f7c9fa8..690cad6e86 100644
--- a/protocols/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
@@ -131,7 +131,7 @@ YAMN_PROTOREGISTRATION POP3ProtocolRegistration =
 
 static wchar_t *FileName = nullptr;
 
-HANDLE RegisterNLClient(const char *name);
+HANDLE RegisterNLClient(char *name);
 
 //--------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------