Skip to content

Commit

Permalink
(#9298) hiredis/1.0.2 Fix AIX with patch from hiredis master.
Browse files Browse the repository at this point in the history
  • Loading branch information
bemehiser authored Feb 27, 2022
1 parent a48eae3 commit c3e383f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
2 changes: 2 additions & 0 deletions recipes/hiredis/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ patches:
"1.0.2":
- patch_file: "patches/fix-cmake.patch"
base_path: "source_subfolder"
- patch_file: "patches/fix-aix.patch"
base_path: "source_subfolder"
"1.0.0":
- patch_file: "patches/fix-cmake.patch"
base_path: "source_subfolder"
15 changes: 15 additions & 0 deletions recipes/hiredis/all/patches/fix-aix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/fmacros.h b/fmacros.h
index 3227faa..754a53c 100644
--- a/fmacros.h
+++ b/fmacros.h
@@ -1,8 +1,10 @@
#ifndef __HIREDIS_FMACRO_H
#define __HIREDIS_FMACRO_H

+#ifndef _AIX
#define _XOPEN_SOURCE 600
#define _POSIX_C_SOURCE 200112L
+#endif

#if defined(__APPLE__) && defined(__MACH__)
/* Enable TCP_KEEPALIVE */

0 comments on commit c3e383f

Please sign in to comment.