Include system headers using "#include <file.h>", so GCC will not issue warnings about them.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@331 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-08-26 23:32:54 +00:00
parent 60a5a592f9
commit 734586a0ab
27 changed files with 84 additions and 81 deletions

View File

@ -15,8 +15,7 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include <iostream> #include <iostream>
#include <cstring>
#include "string.h"
#include "Common.h" #include "Common.h"
#include "Thread.h" #include "Thread.h"
@ -74,10 +73,10 @@ void Console_Submit(const char *cmd)
sscanf(cmd, "%s %08x", temp, &addr); sscanf(cmd, "%s %08x", temp, &addr);
if (addr!=0) if (addr!=0)
{ {
#ifdef LOGGING #ifdef LOGGING
u32 EA = u32 EA =
#endif #endif
Memory::CheckDTLB(addr, Memory::FLAG_NO_EXCEPTION); Memory::CheckDTLB(addr, Memory::FLAG_NO_EXCEPTION);
LOG(CONSOLE, "EA 0x%08x to 0x%08x", addr, EA); LOG(CONSOLE, "EA 0x%08x to 0x%08x", addr, EA);
} }

View File

@ -24,7 +24,7 @@
#include "MemoryCheckDlg.h" #include "MemoryCheckDlg.h"
#include "IniFile.h" #include "IniFile.h"
#include "wx/mstream.h" #include <wx/mstream.h>
extern "C" { extern "C" {
#include "../resources/toolbar_add_breakpoint.c" #include "../resources/toolbar_add_breakpoint.c"

View File

@ -15,12 +15,12 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "wx/button.h" #include <wx/button.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/textdlg.h" #include <wx/textdlg.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "wx/thread.h" #include <wx/thread.h>
#include "wx/mstream.h" #include <wx/mstream.h>
// ugly that this lib included code from the main // ugly that this lib included code from the main
#include "../../DolphinWX/src/Globals.h" #include "../../DolphinWX/src/Globals.h"

View File

@ -18,9 +18,9 @@
#ifndef CODEWINDOW_H_ #ifndef CODEWINDOW_H_
#define CODEWINDOW_H_ #define CODEWINDOW_H_
#include "wx/dialog.h" #include <wx/dialog.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/listbox.h" #include <wx/listbox.h>
#include "Debugger.h" #include "Debugger.h"
#include "CodeView.h" #include "CodeView.h"
#include "Thread.h" #include "Thread.h"

View File

@ -31,7 +31,7 @@ enum
#define wxUSE_XPM_IN_MSW 1 #define wxUSE_XPM_IN_MSW 1
#define USE_XPM_BITMAPS 1 #define USE_XPM_BITMAPS 1
#include "wx/wx.h" #include <wx/wx.h>
// define this to use XPMs everywhere (by default, BMPs are used under Win) // define this to use XPMs everywhere (by default, BMPs are used under Win)
// BMPs use less space, but aren't compiled into the executable on other platforms // BMPs use less space, but aren't compiled into the executable on other platforms

View File

@ -19,11 +19,11 @@
#include "IniFile.h" #include "IniFile.h"
#include "wx/button.h" #include <wx/button.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "wx/thread.h" #include <wx/thread.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "JitWindow.h" #include "JitWindow.h"
#include "HW/CPU.h" #include "HW/CPU.h"
#include "PowerPC/PowerPC.h" #include "PowerPC/PowerPC.h"

View File

@ -20,10 +20,10 @@
#include <vector> #include <vector>
#include "wx/dialog.h" #include <wx/dialog.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "wx/listbox.h" #include <wx/listbox.h>
#include "Debugger.h" #include "Debugger.h"
#include "MemoryView.h" #include "MemoryView.h"
#include "Thread.h" #include "Thread.h"

View File

@ -18,10 +18,10 @@
#include "Debugger.h" #include "Debugger.h"
#include "LogManager.h" #include "LogManager.h"
#include "wx/button.h" #include <wx/button.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/listbox.h" #include <wx/listbox.h>
#include "wx/checklst.h" #include <wx/checklst.h>
#include "LogWindow.h" #include "LogWindow.h"
#include "Console.h" #include "Console.h"

View File

@ -19,11 +19,11 @@
#include "IniFile.h" #include "IniFile.h"
#include "wx/button.h" #include <wx/button.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "wx/thread.h" #include <wx/thread.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "MemoryWindow.h" #include "MemoryWindow.h"
#include "HW/CPU.h" #include "HW/CPU.h"
#include "PowerPC/PowerPC.h" #include "PowerPC/PowerPC.h"

View File

@ -18,9 +18,9 @@
#ifndef MEMORYWINDOW_H_ #ifndef MEMORYWINDOW_H_
#define MEMORYWINDOW_H_ #define MEMORYWINDOW_H_
#include "wx/dialog.h" #include <wx/dialog.h>
#include "wx/textctrl.h" #include <wx/textctrl.h>
#include "wx/listbox.h" #include <wx/listbox.h>
#include "Debugger.h" #include "Debugger.h"
#include "MemoryView.h" #include "MemoryView.h"
#include "Thread.h" #include "Thread.h"

View File

@ -29,7 +29,7 @@
#include "PluginManager.h" #include "PluginManager.h"
#include "MemcardManager.h" #include "MemcardManager.h"
#include "wx/mstream.h" #include <wx/mstream.h>
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// resources // resources

View File

@ -20,7 +20,7 @@
#include <vector> #include <vector>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "ISOFile.h" #include "ISOFile.h"

View File

@ -54,28 +54,28 @@ enum
#define wxUSE_XPM_IN_MSW 1 #define wxUSE_XPM_IN_MSW 1
#define USE_XPM_BITMAPS 1 #define USE_XPM_BITMAPS 1
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes <wx/wx.h>.
//#include "wx/wxprec.h" //#include <wx/wxprec.h>
//#ifndef WX_PRECOMP //#ifndef WX_PRECOMP
#include "wx/wx.h" #include <wx/wx.h>
//#endif //#endif
#include "wx/toolbar.h" #include <wx/toolbar.h>
#include "wx/log.h" #include <wx/log.h>
#include "wx/image.h" #include <wx/image.h>
#include "wx/aboutdlg.h" #include <wx/aboutdlg.h>
#include "wx/filedlg.h" #include <wx/filedlg.h>
#include "wx/spinctrl.h" #include <wx/spinctrl.h>
#include "wx/srchctrl.h" #include <wx/srchctrl.h>
#include "wx/listctrl.h" #include <wx/listctrl.h>
#include "wx/progdlg.h" #include <wx/progdlg.h>
#include "wx/imagpng.h" #include <wx/imagpng.h>
#include "wx/button.h" #include <wx/button.h>
#include "wx/stattext.h" #include <wx/stattext.h>
#include "wx/choice.h" #include <wx/choice.h>
#include "wx/cmdline.h" #include <wx/cmdline.h>
#include "wx/busyinfo.h" #include <wx/busyinfo.h>
// define this to use XPMs everywhere (by default, BMPs are used under Win) // define this to use XPMs everywhere (by default, BMPs are used under Win)
// BMPs use less space, but aren't compiled into the executable on other platforms // BMPs use less space, but aren't compiled into the executable on other platforms

View File

@ -58,7 +58,7 @@ void Host_CloseDisplay(){}
void Host_UpdateStatusBar(const char* _pText){} void Host_UpdateStatusBar(const char* _pText){}
// Include SDL header so it can hijack main(). // Include SDL header so it can hijack main().
#include "SDL.h" #include <SDL.h>
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

View File

@ -20,7 +20,7 @@
#include <mmsystem.h> #include <mmsystem.h>
#include <dsound.h> #include <dsound.h>
#include "dsoundstream.h" #include "DSoundStream.h"
namespace DSound namespace DSound
{ {

View File

@ -20,7 +20,7 @@
#include <mmsystem.h> #include <mmsystem.h>
#include <dsound.h> #include <dsound.h>
#include "dsoundstream.h" #include "DSoundStream.h"
namespace DSound namespace DSound
{ {

View File

@ -43,7 +43,7 @@ DInput dinput;
#else #else
#include "SDL.h" #include <SDL.h>
SDL_Joystick *joy; SDL_Joystick *joy;
int numaxes = 0; int numaxes = 0;
int numbuttons = 0; int numbuttons = 0;

View File

@ -3,7 +3,7 @@
#include "Common.h" #include "Common.h"
#include "D3DBase.h" #include "D3DBase.h"
#include "D3Dtexture.h" #include "D3DTexture.h"
#include "Render.h" #include "Render.h"

View File

@ -84,7 +84,7 @@ inline float ReadBuffer32F()
#include "VertexLoader_Position.h" #include "VertexLoader_Position.h"
#include "VertexLoader_Normal.h" #include "VertexLoader_Normal.h"
#include "VertexLoader_Color.h" #include "VertexLoader_Color.h"
#include "VertexLoader_textCoord.h" #include "VertexLoader_TextCoord.h"
VertexLoader g_VertexLoaders[8]; VertexLoader g_VertexLoaders[8];
TVtxDesc VertexLoader::m_VtxDesc; TVtxDesc VertexLoader::m_VtxDesc;

View File

@ -1,5 +1,4 @@
#include "shlobj.h" #include <shlobj.h>
#include <xstring> #include <xstring>
#include <string> #include <string>
#include "ShellUtil.h" #include "ShellUtil.h"

View File

@ -15,10 +15,10 @@
#include "VertexHandler.h" #include "VertexHandler.h"
#include "TransformEngine.h" #include "TransformEngine.h"
#include "DlgSettings.h" #include "DlgSettings.h"
#include "D3DPostProcess.h" #include "D3DPostprocess.h"
#include "D3DTexture.h" #include "D3DTexture.h"
#include "D3DUtil.h" #include "D3DUtil.h"
#include "W32Util/misc.h" #include "W32Util/Misc.h"
#include "EmuWindow.h" #include "EmuWindow.h"
#include "Utils.h" #include "Utils.h"

View File

@ -2,10 +2,10 @@
#define MAIN_H #define MAIN_H
#include "PluginSpecs_Video.h" #include "PluginSpecs_Video.h"
#include "render.h" #include "Render.h"
extern SVideoInitialize g_VideoInitialize; extern SVideoInitialize g_VideoInitialize;
void DebugLog(const char* _fmt, ...); void DebugLog(const char* _fmt, ...);
#endif #endif

View File

@ -19,7 +19,7 @@
#include "IniFile.h" #include "IniFile.h"
#if defined(_WIN32) #if defined(_WIN32)
#include "svnrev.h" #include "svnrev.h"
#include "OS\Win32.h" #include "OS/Win32.h"
#endif #endif
#include "GLInit.h" #include "GLInit.h"
@ -27,7 +27,7 @@
#define USE_SDL 0 #define USE_SDL 0
#endif #endif
#if USE_SDL #if USE_SDL
#include "SDL.h" #include <SDL.h>
#endif #endif
// Handles OpenGL and the window // Handles OpenGL and the window

View File

@ -28,10 +28,10 @@
#define GLEW_STATIC #define GLEW_STATIC
#include "GLew/glew.h" #include <GLew/glew.h>
#include "GLew/wglew.h" #include <GLew/wglew.h>
#include "GLew/gl.h" #include <GLew/gl.h>
#include "GLew/glext.h" #include <GLew/glext.h>
#else // linux basic definitions #else // linux basic definitions

View File

@ -34,7 +34,7 @@
#include "XFB.h" #include "XFB.h"
#ifdef _WIN32 #ifdef _WIN32
#include "OS\Win32.h" #include "OS/Win32.h"
#else #else
#endif #endif

View File

@ -18,11 +18,11 @@
#include "Globals.h" #include "Globals.h"
#ifdef _WIN32 #ifdef _WIN32
#include "OS\Win32.h" #include "OS/Win32.h"
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include "SDL.h" #include <SDL.h>
#endif #endif
#include "GUI/ConfigDlg.h" #include "GUI/ConfigDlg.h"
@ -96,7 +96,12 @@ void DllConfig(HWND _hParent)
} }
if(!resFound) if(!resFound)
//and add the res //and add the res
{ resos[i] = strBuffer; i++; frame.AddFSReso(szBuffer); frame.AddWindowReso(szBuffer); } {
resos[i] = strBuffer;
i++;
frame.AddFSReso(szBuffer);
frame.AddWindowReso(szBuffer);
}
ZeroMemory(&dmi, sizeof(dmi)); ZeroMemory(&dmi, sizeof(dmi));
} }
frame.ShowModal(); frame.ShowModal();

View File

@ -51,7 +51,7 @@
#include <vector> #include <vector>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include "SDL.h" #include <SDL.h>
#ifdef _WIN32 #ifdef _WIN32
#define SLEEP(x) Sleep(x) #define SLEEP(x) Sleep(x)