Merge lp:~brianaker/gearmand/gearmand-symbol into lp:gearmand

Proposed by Brian Aker on 2013-07-18
Status: Merged
Merged at revision: 831
Proposed branch: lp:~brianaker/gearmand/gearmand-symbol
Merge into: lp:gearmand
Diff against target: 110 lines (+12/-12)
6 files modified
libtest/cmdline.cc (+1/-1)
libtest/core.cc (+2/-2)
libtest/main.cc (+1/-1)
libtest/unittest.cc (+5/-5)
m4/bottom.m4 (+2/-2)
tests/libgearman-1.0/client_test.cc (+1/-1)
To merge this branch: bzr merge lp:~brianaker/gearmand/gearmand-symbol
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-07-18 Pending
Review via email: mp+175484@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libtest/cmdline.cc'
2--- libtest/cmdline.cc 2013-07-12 23:13:42 +0000
3+++ libtest/cmdline.cc 2013-07-18 10:12:51 +0000
4@@ -359,7 +359,7 @@
5 int error;
6 switch ((error= errno))
7 {
8-#ifdef TARGET_OS_LINUX
9+#ifdef __linux
10 case ERESTART:
11 #endif
12 case EINTR:
13
14=== modified file 'libtest/core.cc'
15--- libtest/core.cc 2012-11-10 12:10:51 +0000
16+++ libtest/core.cc 2013-07-18 10:12:51 +0000
17@@ -42,8 +42,8 @@
18
19 void create_core(void)
20 {
21-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
22- if (TARGET_OS_OSX)
23+#if defined(__APPLE__) && __APPLE__
24+ if (__APPLE__)
25 {
26 return;
27 }
28
29=== modified file 'libtest/main.cc'
30--- libtest/main.cc 2013-07-13 09:40:16 +0000
31+++ libtest/main.cc 2013-07-18 10:12:51 +0000
32@@ -94,7 +94,7 @@
33 Valgrind does not currently work reliably, or sometimes at all, on OSX
34 - Fri Jun 15 11:24:07 EDT 2012
35 */
36-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
37+#if defined(__APPLE__) && __APPLE__
38 if (valgrind_is_caller())
39 {
40 return EXIT_SKIP;
41
42=== modified file 'libtest/unittest.cc'
43--- libtest/unittest.cc 2013-05-30 18:20:15 +0000
44+++ libtest/unittest.cc 2013-07-18 10:12:51 +0000
45@@ -657,7 +657,7 @@
46 const char *args[]= { "--fubar", 0 };
47 #if defined(__APPLE__) && __APPLE__
48 ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
49-#elif defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
50+#elif defined(__FreeBSD__) && __FreeBSD__
51 ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
52 #else
53 ASSERT_EQ(Application::SUCCESS, true_app.run(args));
54@@ -855,8 +855,8 @@
55 static test_return_t gdb_wait_services_appliction_TEST(void *)
56 {
57 test_skip(true, false);
58-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
59- test_skip(0, TARGET_OS_OSX);
60+#if defined(__APPLE__) && __APPLE__
61+ test_skip(0, __APPLE__);
62 #endif
63
64 test_skip(0, access("/etc/services", R_OK ));
65@@ -879,8 +879,8 @@
66 test_skip(0, access("libtest/abort", X_OK ));
67 test_skip(true, false);
68
69-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
70- test_skip(0, TARGET_OS_OSX);
71+#if defined(__APPLE__) && __APPLE__
72+ test_skip(0, __APPLE__);
73 #endif
74
75 libtest::Application abort_app("libtest/abort", true);
76
77=== modified file 'm4/bottom.m4'
78--- m4/bottom.m4 2012-10-28 20:04:35 +0000
79+++ m4/bottom.m4 2013-07-18 10:12:51 +0000
80@@ -35,7 +35,7 @@
81 * a lot easier to map back to the unix way with macros than going the other
82 * way without side effect.
83 */
84-#ifdef TARGET_OS_WINDOWS
85+#ifdef _WIN32
86 #define random() rand()
87 #define srandom(a) srand(a)
88 #define get_socket_errno() WSAGetLastError()
89@@ -44,7 +44,7 @@
90 #define SOCKET_ERROR -1
91 #define closesocket(a) close(a)
92 #define get_socket_errno() errno
93-#endif // TARGET_OS_WINDOWS
94+#endif // _WIN32
95
96 #ifndef HAVE_MSG_NOSIGNAL
97 #define MSG_NOSIGNAL 0
98
99=== modified file 'tests/libgearman-1.0/client_test.cc'
100--- tests/libgearman-1.0/client_test.cc 2013-07-14 10:39:28 +0000
101+++ tests/libgearman-1.0/client_test.cc 2013-07-18 10:12:51 +0000
102@@ -814,7 +814,7 @@
103
104 ASSERT_EQ(GEARMAN_SUCCESS, gearman_client_error_code(&client));
105
106-#if defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
107+#if defined(__FreeBSD__) && __FreeBSD__
108 ASSERT_EQ(GEARMAN_TIMEOUT,
109 gearman_client_echo(&client, test_literal_param("foo")));
110 #else

Subscribers

People subscribed via source and target branches

to all changes: