mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-19845: Make my_cpu.h self-contained

Browse source 
Fix up commit f5c080c735
This commit is contained in:
Marko Mäkelä 2020-02-01 14:53:41 +02:00
parent d87b725eeb
commit 4b291588bb
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/my_cpu.h
View file

@ -1,6 +1,6 @@
#ifndef MY_CPU_INCLUDED #ifndef MY_CPU_INCLUDED
#define MY_CPU_INCLUDED #define MY_CPU_INCLUDED
/* Copyright (c) 2013, MariaDB foundation Ab and SkySQL /* Copyright (c) 2013, 2020, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -50,6 +50,13 @@
# define HAVE_PAUSE_INSTRUCTION /* added in Intel Pentium 4 */ # define HAVE_PAUSE_INSTRUCTION /* added in Intel Pentium 4 */
#endif #endif
#ifdef _WIN32
#elif defined HAVE_PAUSE_INSTRUCTION
#elif defined(_ARCH_PWR8)
#else
# include "my_atomic.h"
#endif
static inline void MY_RELAX_CPU(void) static inline void MY_RELAX_CPU(void)
{ {
#ifdef _WIN32 #ifdef _WIN32

3
mysys/my_cpu.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2019, MariaDB Corporation. /* Copyright (c) 2019, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -14,7 +14,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h> #include <my_global.h>
#include <my_atomic.h>
#include <my_cpu.h> #include <my_cpu.h>
#include <my_rdtsc.h> #include <my_rdtsc.h>

3
storage/innobase/include/ib0mutex.h
View file

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 2019, MariaDB Corporation. Copyright (c) 2017, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
@ -29,7 +29,6 @@ Created 2013-03-26 Sunny Bains.
#ifndef ib0mutex_h #ifndef ib0mutex_h
#define ib0mutex_h #define ib0mutex_h
#include "my_atomic.h"
#include "my_cpu.h" #include "my_cpu.h"
#include "os0event.h" #include "os0event.h"
#include "sync0arr.h" #include "sync0arr.h"