summaryrefslogtreecommitdiff
path: root/libs/distrho/src/DistrhoDefines.h
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2015-02-17 11:59:35 +1100
committerDamien Zammit <damien@zamaudio.com>2015-02-17 11:59:35 +1100
commit78883fa7f7ea9d85477a27ed3c569a899ee305fb (patch)
treef1add63ce6f3af86340d7e4c93092776b5479b14 /libs/distrho/src/DistrhoDefines.h
parentaf7a094a0c0e8b658736d77361a2d8d2f99b0006 (diff)
parent8da011deb152227714196f61eab26e1af37a2890 (diff)
Merge pull request #24 from falkTX/master
Update DPF, inital file-browser for ZamSFZ
Diffstat (limited to 'libs/distrho/src/DistrhoDefines.h')
-rw-r--r--libs/distrho/src/DistrhoDefines.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/libs/distrho/src/DistrhoDefines.h b/libs/distrho/src/DistrhoDefines.h
index 501fc28..59e4c34 100644
--- a/libs/distrho/src/DistrhoDefines.h
+++ b/libs/distrho/src/DistrhoDefines.h
@@ -118,23 +118,17 @@ private: \
#endif
/* Define namespace */
-#ifndef DISTRHO_NO_NAMESPACE
-# ifndef DISTRHO_NAMESPACE
-# define DISTRHO_NAMESPACE DISTRHO
-# endif
-# define START_NAMESPACE_DISTRHO namespace DISTRHO_NAMESPACE {
-# define END_NAMESPACE_DISTRHO }
-# define USE_NAMESPACE_DISTRHO using namespace DISTRHO_NAMESPACE;
-#else
-# define START_NAMESPACE_DISTRHO
-# define END_NAMESPACE_DISTRHO
-# define USE_NAMESPACE_DISTRHO
+#ifndef DISTRHO_NAMESPACE
+# define DISTRHO_NAMESPACE DISTRHO
#endif
+#define START_NAMESPACE_DISTRHO namespace DISTRHO_NAMESPACE {
+#define END_NAMESPACE_DISTRHO }
+#define USE_NAMESPACE_DISTRHO using namespace DISTRHO_NAMESPACE;
/* Useful typedefs */
typedef unsigned char uchar;
-typedef unsigned long int ulong;
typedef unsigned short int ushort;
typedef unsigned int uint;
+typedef unsigned long int ulong;
#endif // DISTRHO_DEFINES_H_INCLUDED