diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:22:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:22:43 -0600 |
| commit | 5cba27652d2c311bc4ef391e0db292646d617179 (patch) | |
| tree | 71ae5aff1ea20f245eeeba0c7a1ebe59e45b9fdc /kexi | |
| parent | 1cc2d9ab46ac8c133f5c7959ee1af470bb971d28 (diff) | |
| download | koffice-5cba27652d2c311bc4ef391e0db292646d617179.tar.gz koffice-5cba27652d2c311bc4ef391e0db292646d617179.zip | |
Rename a few build variables for overall consistency
Diffstat (limited to 'kexi')
| -rw-r--r-- | kexi/3rdparty/kexisql/src/os.c | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/os_win.c | 2 | ||||
| -rw-r--r-- | kexi/formeditor/tdevelop_plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | kexi/formeditor/test/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index b47fd961..7b03cab7 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 ec7a0840..2c1947a5 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 62507e9c..6149421e 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 1c022c2d..f1a56307 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) |