diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/FacebookRM/src/common.h | 2 | ||||
| -rw-r--r-- | protocols/Gadu-Gadu/src/gg.h | 4 | ||||
| -rw-r--r-- | protocols/IRCG/IRC_10.vcxproj | 1 | ||||
| -rw-r--r-- | protocols/IRCG/IRC_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | protocols/IRCG/IRC_11.vcxproj | 1 | ||||
| -rw-r--r-- | protocols/IRCG/IRC_11.vcxproj.filters | 3 | ||||
| -rw-r--r-- | protocols/IRCG/src/commandmonitor.h | 22 | ||||
| -rw-r--r-- | protocols/IRCG/src/irc.h | 3 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icqoscar.h | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber.h | 6 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_global.h | 3 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_proto.h | 1 | ||||
| -rw-r--r-- | protocols/Omegle/src/common.h | 2 | ||||
| -rw-r--r-- | protocols/Tlen/src/jabber.h | 4 | ||||
| -rw-r--r-- | protocols/Yahoo/src/libyahoo2/config.h | 2 | ||||
| -rw-r--r-- | protocols/Yahoo/src/yahoo.h | 7 | 
16 files changed, 11 insertions, 55 deletions
| diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h index 23084b8d35..ab8faf4db0 100644 --- a/protocols/FacebookRM/src/common.h +++ b/protocols/FacebookRM/src/common.h @@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define _WIN32_WINNT   0x0500
  #define _WIN32_WINDOWS 0x0500
 -#include <m_stdhdr.h>
 -
  #include <string>
  #include <sstream>
  #include <fstream>
 diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index 2ae43a64d2..9e7f16e454 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -32,8 +32,6 @@  #define _WIN32_WINNT 0x0501
  #endif
 -#include <m_stdhdr.h>
 -
  // Windows headers
  // Visual C++ .NET tries to include winsock.h
  // which is very ver bad
 @@ -44,6 +42,8 @@  #endif
  #include <commctrl.h>
  #include <commdlg.h>
 +
 +#include <malloc.h>
  #include <process.h>
  #include <stdio.h>
  #include <time.h>
 diff --git a/protocols/IRCG/IRC_10.vcxproj b/protocols/IRCG/IRC_10.vcxproj index 1e050d5274..a3b41d3fe3 100644 --- a/protocols/IRCG/IRC_10.vcxproj +++ b/protocols/IRCG/IRC_10.vcxproj @@ -215,7 +215,6 @@      <ClCompile Include="src\windows.cpp" />
    </ItemGroup>
    <ItemGroup>
 -    <ClInclude Include="src\commandmonitor.h" />
      <ClInclude Include="src\irc.h" />
      <ClInclude Include="src\irc_dlg.h" />
      <ClInclude Include="src\irclib.h" />
 diff --git a/protocols/IRCG/IRC_10.vcxproj.filters b/protocols/IRCG/IRC_10.vcxproj.filters index 25e3c6de44..93048461ca 100644 --- a/protocols/IRCG/IRC_10.vcxproj.filters +++ b/protocols/IRCG/IRC_10.vcxproj.filters @@ -69,9 +69,6 @@      </ClCompile>
    </ItemGroup>
    <ItemGroup>
 -    <ClInclude Include="src\commandmonitor.h">
 -      <Filter>Header Files</Filter>
 -    </ClInclude>
      <ClInclude Include="src\irc.h">
        <Filter>Header Files</Filter>
      </ClInclude>
 diff --git a/protocols/IRCG/IRC_11.vcxproj b/protocols/IRCG/IRC_11.vcxproj index 64a0fd3353..8b703db493 100644 --- a/protocols/IRCG/IRC_11.vcxproj +++ b/protocols/IRCG/IRC_11.vcxproj @@ -218,7 +218,6 @@      <ClCompile Include="src\windows.cpp" />
    </ItemGroup>
    <ItemGroup>
 -    <ClInclude Include="src\commandmonitor.h" />
      <ClInclude Include="src\irc.h" />
      <ClInclude Include="src\irc_dlg.h" />
      <ClInclude Include="src\irclib.h" />
 diff --git a/protocols/IRCG/IRC_11.vcxproj.filters b/protocols/IRCG/IRC_11.vcxproj.filters index 3fe7a31e89..7075dac8fe 100644 --- a/protocols/IRCG/IRC_11.vcxproj.filters +++ b/protocols/IRCG/IRC_11.vcxproj.filters @@ -69,9 +69,6 @@      </ClCompile>
    </ItemGroup>
    <ItemGroup>
 -    <ClInclude Include="src\commandmonitor.h">
 -      <Filter>Header Files</Filter>
 -    </ClInclude>
      <ClInclude Include="src\irc.h">
        <Filter>Header Files</Filter>
      </ClInclude>
 diff --git a/protocols/IRCG/src/commandmonitor.h b/protocols/IRCG/src/commandmonitor.h deleted file mode 100644 index 940cb9cc02..0000000000 --- a/protocols/IRCG/src/commandmonitor.h +++ /dev/null @@ -1,22 +0,0 @@ -/*
 -IRC plugin for Miranda IM
 -
 -Copyright (C) 2003-05 Jurgen Persson
 -Copyright (C) 2007-09 George Hazan
 -
 -This program is free software; you can redistribute it and/or
 -modify it under the terms of the GNU General Public License
 -as published by the Free Software Foundation; either version 2
 -of the License, or (at your option) any later version.
 -
 -This program is distributed in the hope that it will be useful,
 -but WITHOUT ANY WARRANTY; without even the implied warranty of
 -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -GNU General Public License for more details.
 -
 -You should have received a copy of the GNU General Public License
 -along with this program; if not, write to the Free Software
 -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 -*/
 -
 -using namespace irc;
 diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h index 0fe14cb629..d82b394a70 100644 --- a/protocols/IRCG/src/irc.h +++ b/protocols/IRCG/src/irc.h @@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #define _WIN32_WINNT 0x0501
  #define _WIN32_IE 0x0501
 -#include "m_stdhdr.h"
 -
  #define _CRT_SECURE_NO_WARNINGS
  #define WIN32_LEAN_AND_MEAN
 @@ -39,6 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #include <stdio.h>
  #include <stdlib.h>
  #include <process.h>
 +#include <malloc.h>
  #include <math.h>
  #include <winsock.h>
  #include <commctrl.h>
 diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h index d946da5ac5..05101b81eb 100644 --- a/protocols/IcqOscarJ/src/icqoscar.h +++ b/protocols/IcqOscarJ/src/icqoscar.h @@ -32,8 +32,6 @@  #define _WIN32_WINNT 0x0501
  #define _WIN32_IE 0x0501
 -#include <m_stdhdr.h>
 -
  // Windows includes
  #include <windows.h>
  #include <commctrl.h>
 diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index b999103128..c0074cda96 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -31,8 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #define MIRANDA_VER 0x0A00
 -#include "m_stdhdr.h"
 -
  #define LISTFOREACH(var__, obj__, list__)	\
  	for (int var__ = 0; (var__ = obj__->ListFindNext(list__, var__)) >= 0; ++var__)
  #define LISTFOREACH_NODEF(var__, obj__, list__)	\
 @@ -43,9 +41,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.   *******************************************************************/
  #define _WIN32_WINNT 0x501
  #define _WIN32_IE 0x501
 +
  #include <windows.h>
  #include <commctrl.h>
  #include <uxtheme.h>
 +
 +#include <malloc.h>
  #include <process.h>
  #include <stdio.h>
  #include <stdarg.h>
 @@ -53,6 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #include <limits.h>
  #include <ctype.h>
  #include <stdarg.h>
 +
  #include <newpluginapi.h>
  #include <m_system.h>
  #include <m_system_cpp.h>
 diff --git a/protocols/MSN/src/msn_global.h b/protocols/MSN/src/msn_global.h index 5df5eff0da..a2588bb523 100644 --- a/protocols/MSN/src/msn_global.h +++ b/protocols/MSN/src/msn_global.h @@ -23,12 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  // this plugin is for Miranda 0.9 or later
  #define MIRANDA_VER 0x0A00
 -#include <m_stdhdr.h>
 -
  #include <windows.h>
  #include <commctrl.h>
  #include <ctype.h>
 +#include <malloc.h>
  #include <process.h>
  #include <stdio.h>
  #include <time.h>
 diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index b9819eb099..22b3a924a1 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifndef _MSN_PROTO_H_
  #define _MSN_PROTO_H_
 -#include <m_stdhdr.h>
  #include <m_protoint.h>
  struct CMsnProto;
 diff --git a/protocols/Omegle/src/common.h b/protocols/Omegle/src/common.h index c2d5be0c2e..76ca316359 100644 --- a/protocols/Omegle/src/common.h +++ b/protocols/Omegle/src/common.h @@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define _WIN32_WINNT   0x0500
  #define _WIN32_WINDOWS 0x0500
 -#include <m_stdhdr.h>
 -
  #include <string>
  #include <cstring>
  #include <sstream>
 diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/jabber.h index 28459d781a..cb06e7e34e 100644 --- a/protocols/Tlen/src/jabber.h +++ b/protocols/Tlen/src/jabber.h @@ -39,10 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #define _except __except
  #define _finally __finally
 -
 -#include "m_stdhdr.h"
 -
 -
  #ifdef _DEBUG
  #define _CRTDBG_MAP_ALLOC
  #include <stdlib.h>
 diff --git a/protocols/Yahoo/src/libyahoo2/config.h b/protocols/Yahoo/src/libyahoo2/config.h index 53ef7ca7cf..5de1dbc82d 100644 --- a/protocols/Yahoo/src/libyahoo2/config.h +++ b/protocols/Yahoo/src/libyahoo2/config.h @@ -22,8 +22,6 @@  #define PACKAGE "libyahoo2"
  #define VERSION "0.7.5"
 -#include <m_stdhdr.h>
 -
  #include <windows.h>
  #include <stdio.h>
 diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h index c0875f3f02..cab4ba5aa4 100644 --- a/protocols/Yahoo/src/yahoo.h +++ b/protocols/Yahoo/src/yahoo.h @@ -19,15 +19,14 @@  	#define snprintf  _snprintf
  #endif
 -#include <m_stdhdr.h>
 +#include <windows.h>
 +#include <shlwapi.h>
 +#include <malloc.h>
  #include <sys/stat.h>
  #include <io.h>
  #include <time.h>
 -#include <windows.h>
 -#include <shlwapi.h>
 -
  /*
   * Yahoo Services
   */
 | 
