hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define maxscale [c|cpp]defs.[h|hh] in terms of maxbase

Browse Source
This commit is contained in:
Johan Wikman
2018-06-15 13:38:07 +03:00
parent 9c6c0a4d95
commit bc5acafa64
2 changed files with 5 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/maxscale/cdefs.h
View File

@ -25,34 +25,10 @@
* - Global constants applicable across the line can be defined here. * - Global constants applicable across the line can be defined here.
*/ */
#ifdef __cplusplus #include <maxbase/cdefs.h>
# define MXS_BEGIN_DECLS extern "C" {
# define MXS_END_DECLS }
#else
# define MXS_BEGIN_DECLS
# define MXS_END_DECLS
#endif
#undef _GNU_SOURCE #define MXS_BEGIN_DECLS MXB_BEGIN_DECLS
#define _GNU_SOURCE 1 #define MXS_END_DECLS MXB_END_DECLS
#undef OPENSSL_THREAD_DEFINES
#define OPENSSL_THREAD_DEFINES 1
/**
* Fix compile errors for PRId64
* in Centos 6
*/
#ifndef __STDC_FORMAT_MACROS
# define __STDC_FORMAT_MACROS
#endif
/**
* Needs to be defined for INT32_MAX and others
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
/** /**
* Define intended for use with strerror. * Define intended for use with strerror.
@ -91,15 +67,4 @@
* *
* The function attributes are compiler specific. * The function attributes are compiler specific.
*/ */
#ifdef __GNUC__ #define mxs_attribute mxb_attribute
#define mxs_attribute(a) __attribute__(a)
#else
#define mxs_attribute(a)
#endif
/**
* COMMON INCLUDE FILES
*/
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>

3
include/maxscale/cppdefs.hh
View File

@ -23,8 +23,7 @@
#endif #endif
#include <maxscale/cdefs.h> #include <maxscale/cdefs.h>
#include <exception> #include <maxbase/ccdefs.hh>
#include <new>
#include <maxscale/log_manager.h> #include <maxscale/log_manager.h>
/** /**