Skip to content
This repository was archived by the owner on Oct 5, 2021. It is now read-only.

Commit 63f68c5

Browse files
Aditya AHery Ramilison
Aditya A
authored and
Hery Ramilison
committed
Bug# 22865112 LACK OF HTONLL CHECK CAUSE MYSQ5.6.30/5.7.12 BUILD FAILURE ON OS X
PROBLEM ------- Build failure in some mac machines due to redefinition of htonll function. FIX --- Introduced a check to not redefine htonll if OS provides htonll function. (cherry picked from commit 4b47067d6e74a5493d0604afed3d852d03092771)
1 parent cb15cc6 commit 63f68c5

File tree

1 file changed

+7
-0
lines changed
  • plugin/innodb_memcached/daemon_memcached/include/memcached

1 file changed

+7
-0
lines changed

plugin/innodb_memcached/daemon_memcached/include/memcached/util.h

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. */
2+
13
#ifndef UTIL_H
24
#define UTIL_H
35
/*
@@ -12,6 +14,11 @@
1214
#include <memcached/visibility.h>
1315
#include <memcached/types.h>
1416

17+
/* Changed for INNODB_MEMCACHED */
18+
#if defined(htonll)
19+
#define HAVE_HTONLL 1
20+
#endif
21+
1522
#ifdef __cplusplus
1623
extern "C" {
1724
#endif

0 commit comments

Comments
 (0)