Fix compilation errors with precompiled headers disabled

Originally committed to SVN as r5484.
This commit is contained in:
Thomas Goyne 2011-07-16 06:42:55 +00:00
parent 0616b39ffe
commit 72bc33fda3
14 changed files with 38 additions and 10 deletions

View file

@ -18,6 +18,8 @@
/// @brief Common paths.
/// @ingroup libaegisub
#include "config.h"
#ifndef LAGI_PRE
#include <vector>
#endif

View file

@ -21,7 +21,6 @@
#ifndef LAGI_PRE
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <climits>
#include <locale>

View file

@ -19,11 +19,9 @@
/// @ingroup libaegisub
#ifndef LAGI_PRE
#include <string>
#include <stdio.h>
#include <time.h>
#include <sys/statvfs.h>
#include <stdint.h>
#include <string>
#include <algorithm>
#endif // LAGI_PRE

View file

@ -18,6 +18,8 @@
/// @brief Unix IO methods.
/// @ingroup libaegisub unix
#include "config.h"
#ifndef LAGI_PRE
#include <sys/stat.h>
#include <errno.h>

View file

@ -18,6 +18,7 @@
/// @brief Unix logging
/// @ingroup libaegisub
#include "config.h"
#include <stdio.h>
#include <time.h>

View file

@ -18,16 +18,25 @@
/// @brief Unix utility methods.
/// @ingroup libaegisub unix
#include "config.h"
#include "libaegisub/util.h"
#ifndef LAGI_PRE
#include <stdarg.h>
#include <stdio.h>
#include <sys/statvfs.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <time.h>
#endif
#include <string>
#include <fstream>
#endif
#include <string.h>
#include "libaegisub/util.h"
namespace agi {
namespace util {
@ -35,12 +44,10 @@ namespace agi {
const std::string DirName(const std::string& path) {
if (path.find('/') == std::string::npos) {
const std::string cwd(".");
return cwd;
return ".";
}
const std::string stripped = path.substr(0, path.rfind("/")+1);
return stripped;
return path.substr(0, path.rfind("/")+1);
}
void Rename(const std::string& from, const std::string& to) {

View file

@ -19,6 +19,7 @@
/// @ingroup base
#ifndef R_PRECOMP
#include <stdint.h>
#endif
#include <libaegisub/option.h>

View file

@ -23,6 +23,7 @@
#include <map>
#include <string>
#include <wx/bitmap.h>
#include <wx/string.h>
#endif

View file

@ -40,6 +40,8 @@
#ifndef AGI_PRE
#include <algorithm>
#include <wx/clipbrd.h>
#endif
#include "command.h"

View file

@ -41,8 +41,12 @@
#ifndef AGI_PRE
#include <wx/config.h>
#include <wx/dirdlg.h>
#include <wx/filedlg.h>
#include <wx/filename.h>
#include <wx/fontenum.h>
#include <wx/msgdlg.h>
#include <wx/sizer.h>
#include <wx/wfstream.h>
#include <wx/zipstrm.h>
#endif

View file

@ -41,6 +41,11 @@
#include <deque>
#include <vector>
#include <wx/dcclient.h>
#include <wx/msgdlg.h>
#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/string.h>
#endif

View file

@ -40,6 +40,8 @@
#include <wx/filedlg.h>
#include <wx/filename.h>
#include <wx/intl.h>
#include <wx/msgdlg.h>
#include <wx/textdlg.h>
#include <wx/tokenzr.h>
#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
#endif

View file

@ -38,6 +38,9 @@
#ifndef AGI_PRE
#include <algorithm>
#include <wx/msgdlg.h>
#include <wx/stattext.h>
#endif
#include "ass_dialogue.h"

View file

@ -29,6 +29,7 @@
#ifndef AGI_PRE
#include <vector>
#include <wx/frame.h>
#include <wx/toolbar.h>
#endif