summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/3rdparty/kexisql/src/os.c2
-rw-r--r--kexi/3rdparty/kexisql3/src/os_win.c2
-rw-r--r--kexi/formeditor/tdevelop_plugin/Makefile.am2
-rw-r--r--kexi/formeditor/test/Makefile.am2
4 files changed, 4 insertions, 4 deletions
diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c
index b47fd9615..7b03cab72 100644
--- a/kexi/3rdparty/kexisql/src/os.c
+++ b/kexi/3rdparty/kexisql/src/os.c
@@ -1367,7 +1367,7 @@ int sqliteOsReadLock(OsFile *id){
ovlp.Offset = FIRST_LOCKBYTE+1;
ovlp.OffsetHigh = 0;
ovlp.hEvent = 0;
- res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY,
+ res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY,
0, N_LOCKBYTE, 0, &ovlp);
}else{
res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0);
diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c
index ec7a08405..2c1947a57 100644
--- a/kexi/3rdparty/kexisql3/src/os_win.c
+++ b/kexi/3rdparty/kexisql3/src/os_win.c
@@ -615,7 +615,7 @@ static int getReadLock(OsFile *id){
ovlp.Offset = SHARED_FIRST;
ovlp.OffsetHigh = 0;
ovlp.hEvent = 0;
- res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
+ res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
}else{
int lk;
sqlite3Randomness(sizeof(lk), &lk);
diff --git a/kexi/formeditor/tdevelop_plugin/Makefile.am b/kexi/formeditor/tdevelop_plugin/Makefile.am
index 62507e9ce..6149421e3 100644
--- a/kexi/formeditor/tdevelop_plugin/Makefile.am
+++ b/kexi/formeditor/tdevelop_plugin/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkformdesigner_kdev_part.la
libkformdesigner_kdev_part_la_SOURCES = kfd_kdev_part.cpp
libkformdesigner_kdev_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(VER_INFO) $(all_libraries)
libkformdesigner_kdev_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
- -lkinterfacedesigner $(LIB_KFILE)
+ -lkinterfacedesigner $(LIB_TDEFILE)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am
index 1c022c2d3..f1a563070 100644
--- a/kexi/formeditor/test/Makefile.am
+++ b/kexi/formeditor/test/Makefile.am
@@ -33,7 +33,7 @@ kde_module_LTLIBRARIES = libkformdesigner_part.la
libkformdesigner_part_la_SOURCES = kfd_part.cpp
libkformdesigner_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(VER_INFO)
-libkformdesigner_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la $(LIB_KFILE)
+libkformdesigner_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la $(LIB_TDEFILE)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)