summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-04-18 14:38:08 -0700
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-04-18 23:56:24 +0200
commit42605753159d7b63276351311e0fd43874a3366b (patch)
treed09aeedfab835fd35e2ddebb0583a4460878cd43 /src/utils
parenta8489adc8c4f6fe8355ea1abbfb7be12d0e73b27 (diff)
downloadmana-42605753159d7b63276351311e0fd43874a3366b.tar.gz
mana-42605753159d7b63276351311e0fd43874a3366b.tar.bz2
mana-42605753159d7b63276351311e0fd43874a3366b.tar.xz
mana-42605753159d7b63276351311e0fd43874a3366b.zip
Remove illegal macro names starting with underscore and capital
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.cpp6
-rw-r--r--src/utils/specialfolder.h4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index 43f5264e..549e77a2 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -28,8 +28,8 @@
#include <sys/stat.h>
-#ifdef _MKDIR_TEST_
-// compile with -D_MKDIR_TEST_ to get a standalone binary
+#ifdef MKDIR_TEST
+// compile with -DMKDIR_TEST to get a standalone binary
#include <cstdio>
#include <cstdlib>
#endif
@@ -96,7 +96,7 @@ int mkdir_r(const char *pathname) {
return -1;
}
-#ifdef _MKDIR_TEST_
+#ifdef MKDIR_TEST
printf("%s\n", tmp);
#endif
*p = '/';
@@ -105,7 +105,7 @@ int mkdir_r(const char *pathname) {
return 0;
}
-#ifdef _MKDIR_TEST_
+#ifdef MKDIR_TEST
int main(int argc, char** argv) {
if (argc < 2) exit(1);
mkdir_r(argv[1]);
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index 9369b4e7..13cfc1c1 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _MKDIR_H
-#define _MKDIR_H
+#ifndef MKDIR_H
+#define MKDIR_H
int mkdir_r(const char *pathname);
diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp
index 64607716..221aeac2 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/utils/specialfolder.cpp
@@ -22,8 +22,8 @@
#include "specialfolder.h"
#include <windows.h>
-#ifdef _SPECIALFOLDERLOCATION_TEST_
-// compile with -D_SPECIALFOLDERLOCATION_TEST_ to get a standalone
+#ifdef SPECIALFOLDERLOCATION_TEST
+// compile with -DSPECIALFOLDERLOCATION_TEST to get a standalone
// binary for testing
#include <iostream>
#endif
@@ -59,7 +59,7 @@ std::string getSpecialFolderLocation(int folderId)
return ret;
}
-#ifdef _SPECIALFOLDERLOCATION_TEST_
+#ifdef SPECIALFOLDERLOCATION_TEST
int main()
{
std::cout << "APPDATA " << getSpecialFolderLocation(CSIDL_APPDATA)
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index c2c2e0be..eef6416b 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SPECIALFOLDER_H
-#define _SPECIALFOLDER_H
+#ifndef SPECIALFOLDER_H
+#define SPECIALFOLDER_H
#ifdef WIN32
#include <shlobj.h>