aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build-mac/mailcore2.xcodeproj/project.pbxproj12
-rw-r--r--example/ios/iOS UI Test/iOS UI Test/main.mm2
-rw-r--r--src/core/basetypes/MCLog.c (renamed from src/core/basetypes/MCLog.cc)6
-rw-r--r--src/core/basetypes/MCLog.h22
-rw-r--r--tests/test-all.mm2
5 files changed, 25 insertions, 19 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index c1b46c92..cedef738 100644
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -125,7 +125,7 @@
C64EA708169E847800778456 /* MCData.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A9169E847800778456 /* MCData.cc */; };
C64EA70A169E847800778456 /* MCHash.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AB169E847800778456 /* MCHash.cc */; };
C64EA70C169E847800778456 /* MCHashMap.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AD169E847800778456 /* MCHashMap.cc */; };
- C64EA70E169E847800778456 /* MCLog.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AF169E847800778456 /* MCLog.cc */; };
+ C64EA70E169E847800778456 /* MCLog.c in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AF169E847800778456 /* MCLog.c */; };
C64EA710169E847800778456 /* MCObject.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6B1169E847800778456 /* MCObject.cc */; };
C64EA712169E847800778456 /* MCRange.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6B3169E847800778456 /* MCRange.cc */; };
C64EA714169E847800778456 /* MCSet.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6B5169E847800778456 /* MCSet.cc */; };
@@ -449,7 +449,7 @@
C6BA2BA21705F4E6003F0E9E /* MCData.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A9169E847800778456 /* MCData.cc */; };
C6BA2BA31705F4E6003F0E9E /* MCHash.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AB169E847800778456 /* MCHash.cc */; };
C6BA2BA41705F4E6003F0E9E /* MCHashMap.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AD169E847800778456 /* MCHashMap.cc */; };
- C6BA2BA51705F4E6003F0E9E /* MCLog.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AF169E847800778456 /* MCLog.cc */; };
+ C6BA2BA51705F4E6003F0E9E /* MCLog.c in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AF169E847800778456 /* MCLog.c */; };
C6BA2BA61705F4E6003F0E9E /* MCObject.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6B1169E847800778456 /* MCObject.cc */; };
C6BA2BA71705F4E6003F0E9E /* MCRange.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6B3169E847800778456 /* MCRange.cc */; };
C6BA2BA81705F4E6003F0E9E /* MCSet.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6B5169E847800778456 /* MCSet.cc */; };
@@ -1206,7 +1206,7 @@
C64EA6AC169E847800778456 /* MCHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCHash.h; sourceTree = "<group>"; };
C64EA6AD169E847800778456 /* MCHashMap.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCHashMap.cc; sourceTree = "<group>"; };
C64EA6AE169E847800778456 /* MCHashMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCHashMap.h; sourceTree = "<group>"; };
- C64EA6AF169E847800778456 /* MCLog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCLog.cc; sourceTree = "<group>"; };
+ C64EA6AF169E847800778456 /* MCLog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MCLog.c; sourceTree = "<group>"; };
C64EA6B0169E847800778456 /* MCLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCLog.h; sourceTree = "<group>"; };
C64EA6B1169E847800778456 /* MCObject.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCObject.cc; sourceTree = "<group>"; };
C64EA6B2169E847800778456 /* MCObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCObject.h; sourceTree = "<group>"; };
@@ -1802,7 +1802,7 @@
C6D6F966171FCF9F006F5B28 /* MCJSONParser.h */,
C6D6F950171E5CB8006F5B28 /* MCMD5.cc */,
C6D6F951171E5CB8006F5B28 /* MCMD5.h */,
- C64EA6AF169E847800778456 /* MCLog.cc */,
+ C64EA6AF169E847800778456 /* MCLog.c */,
C64EA6B0169E847800778456 /* MCLog.h */,
C6D6F952171E5CB8006F5B28 /* MCNull.cc */,
C6D6F953171E5CB8006F5B28 /* MCNull.h */,
@@ -2345,7 +2345,7 @@
C64EA708169E847800778456 /* MCData.cc in Sources */,
C64EA70A169E847800778456 /* MCHash.cc in Sources */,
C64EA70C169E847800778456 /* MCHashMap.cc in Sources */,
- C64EA70E169E847800778456 /* MCLog.cc in Sources */,
+ C64EA70E169E847800778456 /* MCLog.c in Sources */,
C64EA710169E847800778456 /* MCObject.cc in Sources */,
C64EA712169E847800778456 /* MCRange.cc in Sources */,
C64EA714169E847800778456 /* MCSet.cc in Sources */,
@@ -2527,7 +2527,7 @@
C6BA2BA21705F4E6003F0E9E /* MCData.cc in Sources */,
C6BA2BA31705F4E6003F0E9E /* MCHash.cc in Sources */,
C6BA2BA41705F4E6003F0E9E /* MCHashMap.cc in Sources */,
- C6BA2BA51705F4E6003F0E9E /* MCLog.cc in Sources */,
+ C6BA2BA51705F4E6003F0E9E /* MCLog.c in Sources */,
C6BA2BA61705F4E6003F0E9E /* MCObject.cc in Sources */,
C6BA2BA71705F4E6003F0E9E /* MCRange.cc in Sources */,
C6BA2BA81705F4E6003F0E9E /* MCSet.cc in Sources */,
diff --git a/example/ios/iOS UI Test/iOS UI Test/main.mm b/example/ios/iOS UI Test/iOS UI Test/main.mm
index 7793820a..e6253102 100644
--- a/example/ios/iOS UI Test/iOS UI Test/main.mm
+++ b/example/ios/iOS UI Test/iOS UI Test/main.mm
@@ -12,6 +12,6 @@
#import <MailCore/MailCore.h>
int main(int argc, char *argv[]) {
- mailcore::logEnabled = true;
+ MCLogEnabled = 1;
return UIApplicationMain(argc, argv, nil, @"AppDelegate");
}
diff --git a/src/core/basetypes/MCLog.cc b/src/core/basetypes/MCLog.c
index 7db01b41..8744f2dd 100644
--- a/src/core/basetypes/MCLog.cc
+++ b/src/core/basetypes/MCLog.c
@@ -9,7 +9,7 @@
#include <unistd.h>
static pid_t sPid = -1;
-bool mailcore::logEnabled = false;
+int MCLogEnabled = 0;
__attribute__((constructor))
static void initialize() {
@@ -20,7 +20,7 @@ static void logInternalv(FILE * file,
const char * user, const char * filename, unsigned int line,
int dumpStack, const char * format, va_list argp);
-void mailcore::logInternal(const char * user,
+void MCLogInternal(const char * user,
const char * filename,
unsigned int line,
int dumpStack,
@@ -37,7 +37,7 @@ static void logInternalv(FILE * file,
const char * user, const char * filename, unsigned int line,
int dumpStack, const char * format, va_list argp)
{
- if (!mailcore::logEnabled)
+ if (!MCLogEnabled)
return;
while (1) {
diff --git a/src/core/basetypes/MCLog.h b/src/core/basetypes/MCLog.h
index b84a2182..de75314f 100644
--- a/src/core/basetypes/MCLog.h
+++ b/src/core/basetypes/MCLog.h
@@ -6,22 +6,28 @@
#ifdef __cplusplus
-#define MCLog(...) mailcore::logInternal(NULL, __FILE__, __LINE__, 0, __VA_ARGS__)
+#define MCLog(...) MCLogInternal(NULL, __FILE__, __LINE__, 0, __VA_ARGS__)
namespace mailcore {
- extern bool logEnabled;
+ extern int MCLogEnabled;
#ifndef __printflike
#define __printflike(a,b)
#endif
- void logInternal(const char * user,
- const char * filename,
- unsigned int line,
- int dumpStack,
- const char * format, ...) __printflike(5, 6);
-
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void MCLogInternal(const char * user,
+ const char * filename,
+ unsigned int line,
+ int dumpStack,
+ const char * format, ...) __printflike(5, 6);
+#ifdef __cplusplus
+}
+#endif
+
}
#endif
diff --git a/tests/test-all.mm b/tests/test-all.mm
index 2201d6d5..fdb0888c 100644
--- a/tests/test-all.mm
+++ b/tests/test-all.mm
@@ -351,7 +351,7 @@ void testAll()
displayName = MCSTR("My Email");
mailcore::AutoreleasePool * pool = new mailcore::AutoreleasePool();
- mailcore::logEnabled = true;
+ MCLogEnabled = 1;
mailstream_debug = 1;
//mailcore::Data * data = testMessageBuilder();
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 18:59:08 +0000