61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
|
diff -ur xbsql-0.11.orig/test/Makefile.am xbsql-0.11/test/Makefile.am
|
||
|
|
--- xbsql-0.11.orig/test/Makefile.am 2017-08-30 12:48:09.000000000 +0200
|
||
|
|
+++ xbsql-0.11/test/Makefile.am 2017-08-30 12:47:12.000000000 +0200
|
||
|
|
@@ -6,5 +6,5 @@
|
||
|
|
|
||
|
|
S003_multi_SOURCES = S003_multi.cpp
|
||
|
|
|
||
|
|
-S003_multi_LDFLAGS = -lxbase $(DEBUG) ../xbsql/libxbsql.la
|
||
|
|
+S003_multi_LDFLAGS = -lxbase64 $(DEBUG) ../xbsql/libxbsql.la
|
||
|
|
|
||
|
|
diff -ur xbsql-0.11.orig/xbsql/Makefile.am xbsql-0.11/xbsql/Makefile.am
|
||
|
|
--- xbsql-0.11.orig/xbsql/Makefile.am 2017-08-30 12:48:09.000000000 +0200
|
||
|
|
+++ xbsql-0.11/xbsql/Makefile.am 2017-08-30 12:47:34.000000000 +0200
|
||
|
|
@@ -16,10 +16,10 @@
|
||
|
|
xb_assignlist.cpp xb_create.cpp \
|
||
|
|
xbsql.tab.c xb_datetime.cpp
|
||
|
|
|
||
|
|
-libxbsql_la_LDFLAGS = -lxbase
|
||
|
|
+libxbsql_la_LDFLAGS = -lxbase64
|
||
|
|
|
||
|
|
xql_SOURCES = xql.cpp
|
||
|
|
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
|
||
|
|
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
|
||
|
|
|
||
|
|
#
|
||
|
|
#
|
||
|
|
diff -ur xbsql-0.11.orig/xbsql/xbsql.cpp xbsql-0.11/xbsql/xbsql.cpp
|
||
|
|
--- xbsql-0.11.orig/xbsql/xbsql.cpp 2017-08-30 12:48:09.000000000 +0200
|
||
|
|
+++ xbsql-0.11/xbsql/xbsql.cpp 2017-08-30 12:47:12.000000000 +0200
|
||
|
|
@@ -207,7 +207,7 @@
|
||
|
|
break ;
|
||
|
|
|
||
|
|
default :
|
||
|
|
- e = xbStrError (rc) ;
|
||
|
|
+ e = GetErrorMessage (rc) ;
|
||
|
|
break ;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -230,7 +230,7 @@
|
||
|
|
char t[1024] ;
|
||
|
|
va_list aptr ;
|
||
|
|
|
||
|
|
- strcpy (t, xbStrError (rc)) ;
|
||
|
|
+ strcpy (t, GetErrorMessage (rc)) ;
|
||
|
|
strcat (t, ": ") ;
|
||
|
|
int l = strlen(t) ;
|
||
|
|
|
||
|
|
diff -ur xbsql-0.11.orig/xbsql/xbsql.h xbsql-0.11/xbsql/xbsql.h
|
||
|
|
--- xbsql-0.11.orig/xbsql/xbsql.h 2003-03-28 20:07:31.000000000 +0100
|
||
|
|
+++ xbsql-0.11/xbsql/xbsql.h 2017-08-30 12:47:12.000000000 +0200
|
||
|
|
@@ -43,8 +43,7 @@
|
||
|
|
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#include <xbase/xbase.h>
|
||
|
|
-#include <xbase/xbexcept.h>
|
||
|
|
+#include <xbase64/xbase64.h>
|
||
|
|
|
||
|
|
class XBaseSQL ;
|
||
|
|
class XBSQLTable ;
|