Merge lp:~tobi-coldtobi/drizzle/trunk-bug-978007 into lp:drizzle

Proposed by coldtobi
Status: Merged
Approved by: Brian Aker
Approved revision: 2581
Merged at revision: 2586
Proposed branch: lp:~tobi-coldtobi/drizzle/trunk-bug-978007
Merge into: lp:drizzle
Diff against target: 27 lines (+10/-0)
1 file modified
drizzled/drizzled.cc (+10/-0)
To merge this branch: bzr merge lp:~tobi-coldtobi/drizzle/trunk-bug-978007
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+120294@code.launchpad.net

Description of the change

Fix for Build on FreeBSD.
See LP #978007 for details.

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 'drizzled/drizzled.cc'
2--- drizzled/drizzled.cc 2012-06-03 17:33:43 +0000
3+++ drizzled/drizzled.cc 2012-08-19 13:06:26 +0000
4@@ -410,6 +410,12 @@
5 /**
6 Create file to store pid number.
7 */
8+
9+#ifndef O_CLOEXEC
10+#define O_CLOEXEC 0
11+#define DEFINED_O_CLOEXEC
12+#endif
13+
14 static void create_pid_file()
15 {
16 int file;
17@@ -434,6 +440,10 @@
18 unireg_abort << "Can't start server, was unable to create PID file: " << pid_file.file_string();
19 }
20
21+#ifdef DEFINED_O_CLOEXEC
22+#undef O_CLOEXEC
23+#endif
24+
25 /****************************************************************************
26 ** Code to end drizzled
27 ****************************************************************************/

Subscribers

People subscribed via source and target branches

to all changes: