[Kde-imaging] extragear/graphics/digikam/libs/database/sqlite2

[Gilles Caulier]

SVN commit 688560 by cgilles:

digiKam from trunk (KDE4) : and now, digiKam link fine. Time to test !

Marcel, Link fail because 2 main() are found by linker: one in sqlite2 source code and another one in Qt4
I have just renamed sqlite2::main() to main_main(). I hope than all is fine for you...

To kipi-plugins developpers : It will be time to test libkipi and start to port other kipi-plugins to KDE4 (:=)))

CCMAIL: marcel.wiesweg at gmx.de
CCMAIL: digikam-devel at kde.org 
CCMAIL: kde-imaging at kde.org


 M  +2 -1      shell.c  


--- trunk/extragear/graphics/digikam/libs/database/sqlite2/shell.c #688559:688560
@@ -1204,7 +1204,7 @@
   strcpy(continuePrompt,"   ...> ");
 }
 
-int main(int argc, char **argv){
+int main_main(int argc, char **argv){
   char *zErrMsg = 0;
   struct callback_data data;
   const char *zInitFile = 0;
@@ -1352,3 +1352,4 @@
   if( db ) sqlite_close(db);
   return 0;
 }
+