mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
WL#4380
1) Remove solaris sparc specific output produced by the
pre-processor in the .out files
2) Ensure compatibility of preprocessor options for solaris/sparc
platform.
Makefile.am:
1) Added a sed regular expression to remove output produced
by the preprocessor in the solaris sparc platform
2) Removed the -dI option from the preprocessor to enable
solaris/sparc compatibility
include/mysql.h.pp:
Since the -dI option has been removed from the preprocessor
the .pp files will correspondingly change.
This commit is contained in:
parent
e3e2331cdd
commit
3236c07b7f
2 changed files with 7 additions and 16 deletions
|
|
@ -1,8 +1,5 @@
|
|||
#include <sys/types.h>
|
||||
typedef char my_bool;
|
||||
typedef int my_socket;
|
||||
#include "mysql_version.h"
|
||||
#include "mysql_com.h"
|
||||
enum enum_server_command
|
||||
{
|
||||
COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST,
|
||||
|
|
@ -146,7 +143,6 @@ char *get_tty_password(const char *opt_message);
|
|||
const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
|
||||
my_bool my_thread_init(void);
|
||||
void my_thread_end(void);
|
||||
#include "mysql_time.h"
|
||||
enum enum_mysql_timestamp_type
|
||||
{
|
||||
MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
|
||||
|
|
@ -159,7 +155,6 @@ typedef struct st_mysql_time
|
|||
my_bool neg;
|
||||
enum enum_mysql_timestamp_type time_type;
|
||||
} MYSQL_TIME;
|
||||
#include "my_list.h"
|
||||
typedef struct st_list {
|
||||
struct st_list *prev,*next;
|
||||
void *data;
|
||||
|
|
@ -200,8 +195,6 @@ typedef struct st_mysql_field {
|
|||
typedef char **MYSQL_ROW;
|
||||
typedef unsigned int MYSQL_FIELD_OFFSET;
|
||||
typedef unsigned long long my_ulonglong;
|
||||
#include "typelib.h"
|
||||
#include "my_alloc.h"
|
||||
typedef struct st_used_mem
|
||||
{
|
||||
struct st_used_mem *next;
|
||||
|
|
@ -239,7 +232,6 @@ typedef struct st_mysql_rows {
|
|||
unsigned long length;
|
||||
} MYSQL_ROWS;
|
||||
typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;
|
||||
#include "my_alloc.h"
|
||||
typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
|
||||
typedef struct st_mysql_data {
|
||||
MYSQL_ROWS *data;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue