diff options
author | Michael Rose <michael_rose@gmx.de> | 2013-08-18 21:12:54 +0200 |
---|---|---|
committer | Michael Rose <michael_rose@gmx.de> | 2013-08-18 21:12:54 +0200 |
commit | a3c985533c7f11cb4e9faee501995f39fe24ce8f (patch) | |
tree | cfd16af695b795edb91dda0ccfadffd3331b93dc /testing/toxic/main.c | |
parent | 9533cea058aafb96d7129816510d4a3fcb46cbed (diff) |
fix OS check in toxic
Diffstat (limited to 'testing/toxic/main.c')
-rw-r--r-- | testing/toxic/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 72d8633b..f2a3560c 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c | |||
@@ -40,7 +40,7 @@ void setdir() | |||
40 | { | 40 | { |
41 | #ifdef WIN32 | 41 | #ifdef WIN32 |
42 | strcpy(dir, "%appdata%/.tox/"); | 42 | strcpy(dir, "%appdata%/.tox/"); |
43 | #elif defined(MAC_OSX) | 43 | #elif __APPLE__ |
44 | strcpy(dir, "~/Library/Application Support/.tox/"); | 44 | strcpy(dir, "~/Library/Application Support/.tox/"); |
45 | #elif defined(linux) | 45 | #elif defined(linux) |
46 | strcpy(dir, "~/.tox/"); | 46 | strcpy(dir, "~/.tox/"); |
@@ -88,7 +88,7 @@ static Messenger *init_tox() | |||
88 | setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); | 88 | setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); |
89 | #elif defined(WIN32) | 89 | #elif defined(WIN32) |
90 | setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); | 90 | setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); |
91 | #elif defined(MAC_OSX) | 91 | #elif __APPLE__ |
92 | setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters | 92 | setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters |
93 | #else | 93 | #else |
94 | setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); | 94 | setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); |
@@ -108,7 +108,7 @@ int init_connection(void) | |||
108 | 108 | ||
109 | #if WIN32 | 109 | #if WIN32 |
110 | FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); | 110 | FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); |
111 | #elif MAC_OSX | 111 | #elif __APPLE__ |
112 | FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); | 112 | FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); |
113 | #else | 113 | #else |
114 | FILE *fp = fopen("~/.tox/DHTservers", "r"); | 114 | FILE *fp = fopen("~/.tox/DHTservers", "r"); |