summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-07 22:52:35 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-07 22:52:35 +0300
commit5e14ab971129eb95ca02e373fc21adb46c0eaca1 (patch)
tree5316f688c7f617776b7e70c9f64932fe7596cadb /src/utils
parented950471f7ae02c4618fa995c305832f12dc9cd7 (diff)
downloadmanaverse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.tar.gz
manaverse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.tar.bz2
manaverse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.tar.xz
manaverse-5e14ab971129eb95ca02e373fc21adb46c0eaca1.zip
Remove undescore from variables and defines.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/mkdir.cpp8
-rw-r--r--src/utils/mkdir.h4
-rw-r--r--src/utils/specialfolder.cpp4
-rw-r--r--src/utils/specialfolder.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index a031fe717..84c205b33 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -29,7 +29,7 @@
#include <sys/stat.h>
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
// compile with -D_MKDIR_TEST_ to get a standalone binary
#include <cstdio>
#include <cstdlib>
@@ -94,7 +94,7 @@ int mkdir_r(const char *pathname)
return -1;
}
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
printf("%s\n", tmp);
#endif
*p = '/';
@@ -153,7 +153,7 @@ int mkdir_r(const char *pathname)
return -1;
}
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
printf("%s\n", tmp);
#endif
*p = '/';
@@ -164,7 +164,7 @@ int mkdir_r(const char *pathname)
}
#endif
-#ifdef _MKDIR_TEST_
+#ifdef M_MKDIR_TEST_
int main(int argc, char** argv)
{
if (argc < 2) exit(1);
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index b1fb9afb0..deff75475 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _MKDIR_H
-#define _MKDIR_H
+#ifndef M_MKDIR_H
+#define M_MKDIR_H
int mkdir_r(const char *pathname);
diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp
index 5ac06848f..31eaec687 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/utils/specialfolder.cpp
@@ -23,7 +23,7 @@
#include "utils/specialfolder.h"
#include <windows.h>
-#ifdef _SPECIALFOLDERLOCATION_TEST_
+#ifdef M_SPECIALFOLDERLOCATION_TEST_
// compile with -D_SPECIALFOLDERLOCATION_TEST_ to get a standalone
// binary for testing
#include <iostream>
@@ -62,7 +62,7 @@ std::string getSpecialFolderLocation(int folderId)
return ret;
}
-#ifdef _SPECIALFOLDERLOCATION_TEST_
+#ifdef M_SPECIALFOLDERLOCATION_TEST_
int main()
{
std::cout << "APPDATA " << getSpecialFolderLocation(CSIDL_APPDATA)
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index 2ca6259c6..571817370 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SPECIALFOLDER_H
-#define _SPECIALFOLDER_H
+#ifndef M_SPECIALFOLDER_H
+#define M_SPECIALFOLDER_H
#ifdef WIN32
#include <shlobj.h>