diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:19:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:19:15 -0600 |
| commit | 8b932368eec0346eb344f87b7aae7b7b6cde3dfb (patch) | |
| tree | 9bb81c0ca248d856e28247cf49617a98a57ef0e2 | |
| parent | 092ba62c18001ae5e15ff5c2f95a94aaabf71502 (diff) | |
| download | digikam-8b932368.tar.gz digikam-8b932368.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | digikam/digikam/Makefile.am | 2 | ||||
| -rw-r--r-- | digikam/libs/sqlite2/os.c | 2 | ||||
| -rw-r--r-- | digikam/libs/sqlite3/sqlite3.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d8223de..38bbafe 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2111,14 +2111,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2128,7 +2128,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am index e41214d..99cae41 100644 --- a/digikam/digikam/Makefile.am +++ b/digikam/digikam/Makefile.am @@ -149,7 +149,7 @@ digikam_LDADD = $(LIB_QT) \ $(LIB_TDECORE) \ $(LIB_TDEUI) \ $(LIBSOCKET) \ - $(LIB_KFILE) \ + $(LIB_TDEFILE) \ $(LIB_KPARTS) \ $(LIB_KUTILS) \ libdigikam.la diff --git a/digikam/libs/sqlite2/os.c b/digikam/libs/sqlite2/os.c index dccd65f..ecc8a16 100644 --- a/digikam/libs/sqlite2/os.c +++ b/digikam/libs/sqlite2/os.c @@ -1371,7 +1371,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/digikam/libs/sqlite3/sqlite3.c b/digikam/libs/sqlite3/sqlite3.c index 3b3b067..8710eac 100644 --- a/digikam/libs/sqlite3/sqlite3.c +++ b/digikam/libs/sqlite3/sqlite3.c @@ -22538,10 +22538,10 @@ static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){ } /* -** LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. +** LOCTDEFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */ -#ifndef LOCKFILE_FAIL_IMMEDIATELY -# define LOCKFILE_FAIL_IMMEDIATELY 1 +#ifndef LOCTDEFILE_FAIL_IMMEDIATELY +# define LOCTDEFILE_FAIL_IMMEDIATELY 1 #endif /* @@ -22556,7 +22556,7 @@ static int getReadLock(winFile *pFile){ ovlp.Offset = SHARED_FIRST; ovlp.OffsetHigh = 0; ovlp.hEvent = 0; - res = LockFileEx(pFile->h, LOCKFILE_FAIL_IMMEDIATELY, + res = LockFileEx(pFile->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE, 0, &ovlp); }else{ int lk; |