diff options
author | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-14 15:06:06 +0200 |
---|---|---|
committer | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-14 15:06:06 +0200 |
commit | 92c59963f82f81aa3202657e7fdbb2592924ede3 (patch) | |
tree | b7eb2474528a4998fa102e3ec9119b908cee08b4 /converter | |
parent | Added HOOK_WEATHER_CHANGE. (diff) | |
download | cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.tar cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.tar.gz cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.tar.bz2 cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.tar.lz cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.tar.xz cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.tar.zst cuberite-92c59963f82f81aa3202657e7fdbb2592924ede3.zip |
Diffstat (limited to 'converter')
-rw-r--r-- | converter/source/MemoryLeak.h | 36 | ||||
-rw-r--r-- | converter/source/cDeNotch.cpp | 8 | ||||
-rw-r--r-- | converter/source/cMakeDir.cpp | 46 | ||||
-rw-r--r-- | converter/source/cMakeDir.h | 12 | ||||
-rw-r--r-- | converter/source/main.cpp | 8 |
5 files changed, 55 insertions, 55 deletions
diff --git a/converter/source/MemoryLeak.h b/converter/source/MemoryLeak.h index 6ac06a302..2d62f2a4b 100644 --- a/converter/source/MemoryLeak.h +++ b/converter/source/MemoryLeak.h @@ -1,18 +1,18 @@ -#pragma once
-
-#ifdef _WIN32
-
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-
-#ifndef DEBUG_NEW
-#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
-#define new DEBUG_NEW
-#endif
-
-#endif
-
-#endif
+#pragma once + +#ifdef _WIN32 + +#ifdef _DEBUG + +#define _CRTDBG_MAP_ALLOC +#include <stdlib.h> +#include <crtdbg.h> + +#ifndef DEBUG_NEW +#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) +#define new DEBUG_NEW +#endif + +#endif + +#endif diff --git a/converter/source/cDeNotch.cpp b/converter/source/cDeNotch.cpp index 89075a92e..75d4ffa9d 100644 --- a/converter/source/cDeNotch.cpp +++ b/converter/source/cDeNotch.cpp @@ -25,10 +25,10 @@ inline bool fOpenFile( FILE*& a_hFile, const char* a_FileName, const char* a_Mode ) { -#ifdef _WIN32
- return fopen_s(&a_hFile, a_FileName, a_Mode ) == 0;
-#else
- return (a_hFile = fopen(a_FileName, a_Mode )) != 0;
+#ifdef _WIN32 + return fopen_s(&a_hFile, a_FileName, a_Mode ) == 0; +#else + return (a_hFile = fopen(a_FileName, a_Mode )) != 0; #endif } diff --git a/converter/source/cMakeDir.cpp b/converter/source/cMakeDir.cpp index 60817d5aa..579d39359 100644 --- a/converter/source/cMakeDir.cpp +++ b/converter/source/cMakeDir.cpp @@ -1,24 +1,24 @@ -#include "cMakeDir.h"
-
-#ifndef _WIN32
-//#include <cstring> // If something is missing, uncomment some of these!
-//#include <cstdlib>
-//#include <stdio.h>
-#include <sys/stat.h> // for mkdir
-//#include <sys/types.h>
-#else
-#include <Windows.h>
-#endif
-
-void cMakeDir::MakeDir( const char* a_Directory )
-{
-#ifdef _WIN32
- SECURITY_ATTRIBUTES Attrib;
- Attrib.nLength = sizeof(SECURITY_ATTRIBUTES);
- Attrib.lpSecurityDescriptor = NULL;
- Attrib.bInheritHandle = false;
- ::CreateDirectory(a_Directory, &Attrib);
-#else
- mkdir(a_Directory, S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
+#include "cMakeDir.h" + +#ifndef _WIN32 +//#include <cstring> // If something is missing, uncomment some of these! +//#include <cstdlib> +//#include <stdio.h> +#include <sys/stat.h> // for mkdir +//#include <sys/types.h> +#else +#include <Windows.h> +#endif + +void cMakeDir::MakeDir( const char* a_Directory ) +{ +#ifdef _WIN32 + SECURITY_ATTRIBUTES Attrib; + Attrib.nLength = sizeof(SECURITY_ATTRIBUTES); + Attrib.lpSecurityDescriptor = NULL; + Attrib.bInheritHandle = false; + ::CreateDirectory(a_Directory, &Attrib); +#else + mkdir(a_Directory, S_IRWXU | S_IRWXG | S_IRWXO); +#endif }
\ No newline at end of file diff --git a/converter/source/cMakeDir.h b/converter/source/cMakeDir.h index 378df2a36..240b76507 100644 --- a/converter/source/cMakeDir.h +++ b/converter/source/cMakeDir.h @@ -1,7 +1,7 @@ -#pragma once
-
-class cMakeDir
-{
-public:
- static void MakeDir( const char* a_Directory );
+#pragma once + +class cMakeDir +{ +public: + static void MakeDir( const char* a_Directory ); };
\ No newline at end of file diff --git a/converter/source/main.cpp b/converter/source/main.cpp index 6239cbd43..5df378cd6 100644 --- a/converter/source/main.cpp +++ b/converter/source/main.cpp @@ -14,8 +14,8 @@ int main () { -#ifdef _DEBUG
- _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+#ifdef _DEBUG + _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); #endif cTimer Timer; @@ -63,8 +63,8 @@ int main () clock_t progEnd = clock(); //end main program timer std::cout << "Time to complete converter: " << double(Timer.diffclock(progEnd,progBegin)) << " Seconds"<< std::endl; -#ifdef _DEBUG
- _CrtDumpMemoryLeaks();
+#ifdef _DEBUG + _CrtDumpMemoryLeaks(); #endif #ifdef _WIN32 |