database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-11 15:22:09 +03:00
Code Activity

WL#4380

Browse Source 
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.
This commit is contained in:
Narayanan V
2008-08-06 23:43:37 +05:30
parent 10aa617276
commit a9775e8507
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@ -259,12 +259,10 @@ TEST_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
# to prevent seeing these messages. # to prevent seeing these messages.
# 2) sed the output to # 2) sed the output to
# 2.1) remove blank lines and lines that begin with "# " # 2.1) remove blank lines and lines that begin with "# "
# (The header information is retained to enable easy # 2.2) When gcc -E is run on the Mac OS and solaris sparc platforms it
# analysis of abi diffs at a later stage). # introduces a line of output that shows up as a difference between
# 2.2) When gcc -E is run in the Mac OS it introduces a line of output # the .pp and .out files. Remove these OS specific preprocessor text
# that results in showing up as a difference between the .pp and # inserted by the preprocessor.
# .out files. Remove this OS specific preprocessor text inserted by
# the preprocessor in the MAC OS.
# 3) diff the generated file and the canons (.pp files already in # 3) diff the generated file and the canons (.pp files already in
# the repository). # the repository).
# 4) delete the .out file that is generated. # 4) delete the .out file that is generated.
@ -294,7 +292,7 @@ abi_check_all: $(TEST_PREPROCESSOR_HEADER)
do_abi_check: do_abi_check:
set -ex; \ set -ex; \
for file in $(abi_headers); do \ for file in $(abi_headers); do \
@CC@ -E -nostdinc -dI \ @CC@ -E -nostdinc \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/include/mysql \ -I$(top_srcdir)/include/mysql \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
@ -304,7 +302,8 @@ do_abi_check:
$$file 2>/dev/null | \ $$file 2>/dev/null | \
@SED@ -e '/^# /d' \ @SED@ -e '/^# /d' \
-e '/^[ ]*$$/d' \ -e '/^[ ]*$$/d' \
-e '/^#pragma GCC set_debug_pwd/d' > \ -e '/^#pragma GCC set_debug_pwd/d' \
-e '/^#ident/d' > \
$(top_builddir)/abi_check.out; \ $(top_builddir)/abi_check.out; \
@DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
@RM@ $(top_builddir)/abi_check.out; \ @RM@ $(top_builddir)/abi_check.out; \

8
include/mysql.h.pp
View File

@ -1,8 +1,5 @@
#include <sys/types.h>
typedef char my_bool; typedef char my_bool;
typedef int my_socket; typedef int my_socket;
#include "mysql_version.h"
#include "mysql_com.h"
enum enum_server_command enum enum_server_command
{ {
COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST, 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); const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
my_bool my_thread_init(void); my_bool my_thread_init(void);
void my_thread_end(void); void my_thread_end(void);
#include "mysql_time.h"
enum enum_mysql_timestamp_type enum enum_mysql_timestamp_type
{ {
MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1, MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
@ -159,7 +155,6 @@ typedef struct st_mysql_time
my_bool neg; my_bool neg;
enum enum_mysql_timestamp_type time_type; enum enum_mysql_timestamp_type time_type;
} MYSQL_TIME; } MYSQL_TIME;
#include "my_list.h"
typedef struct st_list { typedef struct st_list {
struct st_list *prev,*next; struct st_list *prev,*next;
void *data; void *data;
@ -200,8 +195,6 @@ typedef struct st_mysql_field {
typedef char **MYSQL_ROW; typedef char **MYSQL_ROW;
typedef unsigned int MYSQL_FIELD_OFFSET; typedef unsigned int MYSQL_FIELD_OFFSET;
typedef unsigned long long my_ulonglong; typedef unsigned long long my_ulonglong;
#include "typelib.h"
#include "my_alloc.h"
typedef struct st_used_mem typedef struct st_used_mem
{ {
struct st_used_mem *next; struct st_used_mem *next;
@ -239,7 +232,6 @@ typedef struct st_mysql_rows {
unsigned long length; unsigned long length;
} MYSQL_ROWS; } MYSQL_ROWS;
typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;
#include "my_alloc.h"
typedef struct embedded_query_result EMBEDDED_QUERY_RESULT; typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
typedef struct st_mysql_data { typedef struct st_mysql_data {
MYSQL_ROWS *data; MYSQL_ROWS *data;