Gearman

Merge lp:~trond-norbye/gearmand/strings_h into lp:gearmand/1.0

  1. strings_h
  2. Merge into 1.0
Proposed by Trond Norbye
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trond-norbye/gearmand/strings_h
Merge into: lp:gearmand/1.0
Diff against target: None lines
To merge this branch: bzr merge lp:~trond-norbye/gearmand/strings_h
Reviewer Review Type Date Requested Status
Gearman-developers Pending
Review via email: mp+7143@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Trond Norbye (trond-norbye) wrote :

queue_libmemcached.c use the index() function, and the prototype for that function is in strings.h on Solaris. This patch detects and add strings.h into common.h

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-06-01 05:09:14 +0000
3+++ configure.ac 2009-06-06 08:12:55 +0000
4@@ -122,7 +122,7 @@
5 AC_HEADER_TIME
6 AC_CHECK_HEADERS(assert.h errno.h fcntl.h getopt.h netinet/tcp.h pwd.h signal.h)
7 AC_CHECK_HEADERS(stdarg.h stdio.h stdlib.h string.h sys/resource.h sys/stat.h)
8-AC_CHECK_HEADERS(sys/socket.h sys/types.h sys/utsname.h unistd.h)
9+AC_CHECK_HEADERS(sys/socket.h sys/types.h sys/utsname.h unistd.h strings.h)
10
11 AC_CHECK_HEADERS(pthread.h)
12 AC_CHECK_LIB(pthread, pthread_create)
13
14=== modified file 'libgearman/common.h'
15--- libgearman/common.h 2009-05-28 20:47:41 +0000
16+++ libgearman/common.h 2009-06-06 08:12:55 +0000
17@@ -46,6 +46,9 @@
18 #ifdef HAVE_STRING_H
19 #include <string.h>
20 #endif
21+#ifdef HAVE_STRINGS_H
22+#include <strings.h>
23+#endif
24 #ifdef HAVE_SYS_UTSNAME_H
25 #include <sys/utsname.h>
26 #endif

Subscribers

People subscribed via source and target branches