diff options
| -rw-r--r-- | src/chatlog.h | 4 | ||||
| -rw-r--r-- | src/gui/updatewindow.h | 4 | ||||
| -rw-r--r-- | src/log.h | 4 | ||||
| -rw-r--r-- | src/shopitem.h | 4 | ||||
| -rw-r--r-- | src/utils/mkdir.cpp | 8 | ||||
| -rw-r--r-- | src/utils/mkdir.h | 4 | ||||
| -rw-r--r-- | src/utils/specialfolder.cpp | 6 | ||||
| -rw-r--r-- | src/utils/specialfolder.h | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/src/chatlog.h b/src/chatlog.h index a21408d3..df0af800 100644 --- a/src/chatlog.h +++ b/src/chatlog.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CHATLOG_H -#define _CHATLOG_H +#ifndef CHATLOG_H +#define CHATLOG_H #include <fstream> diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index 4f6d428a..a4dbf674 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _UPDATERWINDOW_H -#define _UPDATERWINDOW_H +#ifndef UPDATERWINDOW_H +#define UPDATERWINDOW_H #include "gui/widgets/window.h" @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _LOG_H -#define _LOG_H +#ifndef LOG_H +#define LOG_H #include <fstream> diff --git a/src/shopitem.h b/src/shopitem.h index 9b3b9ec9..ecb99e72 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SHOPITEM_H -#define _SHOPITEM_H +#ifndef SHOPITEM_H +#define SHOPITEM_H #include "item.h" 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> |