mysqlcppconn/mysql-connector-c++-1.1.0.patch

   1 --- misc/mysql-connector-c++-1.1.0/cppconn/build_config.h       2010-09-10 11:47:47.000000000 +0200
   2 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/build_config.h 2011-11-12 00:45:19.000000000 +0100
   3 @@ -25,25 +25,23 @@
   4  #ifndef _SQL_BUILD_CONFIG_H_
   5  #define _SQL_BUILD_CONFIG_H_
   6
   7 -#ifndef CPPCONN_PUBLIC_FUNC
   8 +#ifndef _SAL_TYPES_H_
   9 +#include <sal/types.h>
  10 +#endif
  11
  12 -#if defined(_WIN32)
  13   // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
  14    #ifdef mysqlcppconn_EXPORTS
  15 -    #define CPPCONN_PUBLIC_FUNC __declspec(dllexport)
  16 +    #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_EXPORT
  17    #else
  18      // this is for static build
  19      #ifdef CPPCONN_LIB_BUILD
  20        #define CPPCONN_PUBLIC_FUNC
  21      #else
  22        // this is for clients using dynamic lib
  23 -      #define CPPCONN_PUBLIC_FUNC __declspec(dllimport)
  24 +      #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT
  25      #endif
  26    #endif
  27 -#else
  28 -  #define CPPCONN_PUBLIC_FUNC
  29 -#endif
  30
  31 -#endif    //#ifndef CPPCONN_PUBLIC_FUNC
  32 +  #define CPPCONN_PUBLIC_EXCEPTION SAL_EXCEPTION_DLLPUBLIC_EXPORT
  33
  34  #endif    //#ifndef _SQL_BUILD_CONFIG_H_
  35 --- misc/mysql-connector-c++-1.1.0/cppconn/config.h     2009-08-14 10:17:38.234375000 +0200
  36 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/config.h       2009-08-14 09:56:37.000000000 +0200
  37 @@ -1 +1,34 @@
  38 -dummy
  39 +#include <sal/types.h>
  40 +
  41 +#define HAVE_FUNCTION_STRTOL 1
  42 +#define HAVE_FUNCTION_STRTOUL 1
  43 +#define HAVE_FUNCTION_STRTOL 1
  44 +#define HAVE_FUNCTION_STRTOULL 1
  45 +
  46 +#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX)
  47 +    #define HAVE_STDINT_H
  48 +    #define HAVE_INTTYPES_H
  49 +#endif
  50 +
  51 +#ifdef HAVE_STDINT_H
  52 +#include <stdint.h>
  53 +#endif
  54 +
  55 +#ifdef HAVE_INTTYPES_H
  56 +#include <inttypes.h>
  57 +#endif
  58 +
  59 +#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
  60 +
  61 +// if we do not have the standard C99 integer types, then define them based on the respective SAL types
  62 +#if !defined(_SYS_TYPES_H)
  63 +typedef sal_Int8    int8_t;
  64 +typedef sal_Int16   int16_t;
  65 +typedef sal_Int32   int32_t;
  66 +#endif // !defined(_SYS_TYPES_H)
  67 +typedef sal_uInt8   uint8_t;
  68 +typedef sal_uInt16  uint16_t;
  69 +typedef sal_uInt32  uint32_t;
  70 +typedef sal_Int64   int64_t;
  71 +typedef sal_uInt64  uint64_t;
  72 +#endif // !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
  73 --- misc/mysql-connector-c++-1.1.0/cppconn/exception.h  2009-08-20 17:51:23.000000000 +0200
  74 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/exception.h    2009-09-11 09:41:41.076379817 +0200
  75 @@ -37,7 +37,7 @@
  76  #pragma warning(push)
  77  #pragma warning(disable: 4275)
  78  #endif
  79 -class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
  80 +class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
  81  {
  82  #ifdef _WIN32
  83  #pragma warning(pop)
  84 @@ -83,26 +83,26 @@
  85         MEMORY_ALLOC_OPERATORS(SQLException)
  86  };
  87
  88 -struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
  89 +struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
  90  {
  91         MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  92         MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
  93  };
  94
  95 -struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
  96 +struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
  97  {
  98         InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  99         InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
 100  };
 101
 102 -struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
 103 +struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
 104  {
 105         InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
 106         InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
 107  };
 108
 109
 110 -struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
 111 +struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
 112  {
 113         NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
 114         NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
 115 --- misc/mysql-connector-c++-1.1.0/driver/makefile.mk   2009-09-11 09:42:34.087202551 +0200
 116 +++ misc/build/mysql-connector-c++-1.1.0/driver/makefile.mk     2009-09-11 09:42:25.902286382 +0200
 117 @@ -1 +1,64 @@
 118 -dummy
 119 +PRJ=..$/..$/..$/..$/..
 120 +
 121 +.INCLUDE : $(PRJ)$/cppconn_config.pmk
 122 +
 123 +PRJINC=..
 124 +TARGET=$(PRJNAME)
 125 +
 126 +# --- Settings -----------------------------------------------------
 127 +
 128 +.INCLUDE :  settings.mk
 129 +
 130 +.INCLUDE : $(PRJ)$/mysql_config.pmk
 131 +
 132 +# --- Files --------------------------------------------------------
 133 +
 134 +.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
 135 +    SHL1NOCHECK=TRUE
 136 +.ENDIF
 137 +SHL1TARGET=$(TARGET)
 138 +
 139 +LIB1TARGET=$(SLB)$/$(PRJNAME).lib
 140 +LIB1OBJFILES+= \
 141 +        $(SLO)$/mysql_art_resultset.obj \
 142 +        $(SLO)$/mysql_art_rset_metadata.obj \
 143 +        $(SLO)$/mysql_connection.obj \
 144 +        $(SLO)$/mysql_debug.obj \
 145 +        $(SLO)$/mysql_driver.obj \
 146 +        $(SLO)$/mysql_metadata.obj \
 147 +        $(SLO)$/mysql_parameter_metadata.obj \
 148 +        $(SLO)$/mysql_prepared_statement.obj \
 149 +        $(SLO)$/mysql_ps_resultset.obj \
 150 +        $(SLO)$/mysql_ps_resultset_metadata.obj \
 151 +        $(SLO)$/mysql_resultbind.obj \
 152 +        $(SLO)$/mysql_resultset.obj \
 153 +        $(SLO)$/mysql_resultset_metadata.obj \
 154 +        $(SLO)$/mysql_statement.obj \
 155 +        $(SLO)$/mysql_util.obj \
 156 +        $(SLO)$/mysql_warning.obj \
 157 +
 158 +SHL1STDLIBS=\
 159 +       $(MYSQL_LIB)
 160 +
 161 +SHL1RPATH=OXT
 162 +SHL1IMPLIB=  i$(TARGET)
 163 +SHL1LIBS=    $(LIB1TARGET) $(SLB)$/$(CPPCONN_NATIVEAPI).lib
 164 +SHL1DEF=     $(MISC)$/$(SHL1TARGET).def
 165 +DEF1NAME=    $(SHL1TARGET)
 166 +DEF1DEPN=    $(MISC)$/$(SHL1TARGET).flt \
 167 +              $(LIB1TARGET)
 168 +DEFLIB1NAME=$(TARGET)
 169 +
 170 +# --- Targets ------------------------------------------------------
 171 +
 172 +.INCLUDE :  target.mk
 173 +
 174 +# --- filter file ------------------------------
 175 +
 176 +.IF "$(depend)"==""
 177 +$(MISC)$/$(SHL1TARGET).flt: makefile.mk
 178 +    @echo CLEAR_THE_FILE       > $@
 179 +       @echo _TI                               >>$@
 180 +       @echo _real                             >>$@
 181 +       @echo __CT                              >>$@
 182 +.ENDIF # "$(depend)"==""
 183 --- misc/mysql-connector-c++-1.1.0/driver/mysql_debug.h 2009-08-13 17:13:46.000000000 +0200
 184 +++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_debug.h   2009-08-14 09:56:37.015625000 +0200
 185 @@ -25,16 +25,6 @@
 186
 187
 188
 189 -#if defined(WE_HAVE_VARARGS_MACRO_SUPPORT) && (CPPCONN_TRACE_ENABLED || defined(SAL_DLLPRIVATE))
 190 -       #define CPP_ENTER(msg)                  const boost::shared_ptr< MySQL_DebugLogger > __l = this->logger;(void)__l;\
 191 -                                                                       MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, this->logger)
 192 -       #define CPP_ENTER_WL(l, msg)    const boost::shared_ptr< MySQL_DebugLogger > __l = (l);(void)__l;\
 193 -                                                                       MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, (l))
 194 -       #define CPP_INFO(msg)           {if (__l) __l->log("INF", msg); }
 195 -       #define CPP_INFO_FMT(...)       {if (__l) __l->log_va("INF", __VA_ARGS__); }
 196 -       #define CPP_ERR(msg)            {if (__l) __l->log("ERR", msg); }
 197 -       #define CPP_ERR_FMT(...)        {if (__l) __l->log_va("ERR", __VA_ARGS__); }
 198 -#else
 199         #define CPP_ENTER(msg)
 200         #define CPP_ENTER_WL(l, msg)
 201         #define CPP_INFO(msg)
 202 @@ -42,7 +32,6 @@
 203         #define CPP_ENTER_WL(l, msg)
 204         static inline void CPP_INFO_FMT(...) {}
 205         static inline void CPP_ERR_FMT(...) {}
 206 -#endif
 207
 208  #include <stack>
 209  #include "mysql_util.h"
 210 --- misc/mysql-connector-c++-1.1.0/driver/nativeapi/makefile.mk 2009-08-17 21:32:53.694119382 +0200
 211 +++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/makefile.mk   2009-08-17 21:32:50.534346360 +0200
 212 @@ -1 +1,24 @@
 213 -dummy
 214 +PRJ=..$/..$/..$/..$/..$/..
 215 +PRJINC=..$/..
 216 +
 217 +.INCLUDE : $(PRJ)$/cppconn_config.pmk
 218 +
 219 +TARGET=$(CPPCONN_NATIVEAPI)
 220 +
 221 +# --- Settings -----------------------------------------------------
 222 +
 223 +.INCLUDE :  settings.mk
 224 +
 225 +.INCLUDE : $(PRJ)$/mysql_config.pmk
 226 +
 227 +LIB1TARGET=$(SLB)$/$(TARGET).lib
 228 +LIB1OBJFILES+= \
 229 +        $(SLO)$/mysql_client_api.obj \
 230 +        $(SLO)$/library_loader.obj \
 231 +        $(SLO)$/mysql_native_driver_wrapper.obj \
 232 +        $(SLO)$/mysql_native_connection_wrapper.obj \
 233 +        $(SLO)$/mysql_native_resultset_wrapper.obj \
 234 +        $(SLO)$/mysql_native_statement_wrapper.obj \
 235 +
 236 +# --- Targets ------------------------------------------------------
 237 +.INCLUDE :  target.mk