aMule Forum

Please login or register.

Login with username, password and session length
Advanced search  

News:

We're back! (IN POG FORM)

Author Topic: [r9311] IP2Country  (Read 4642 times)

Schuttwegraeumer

  • Sr. Member
  • ****
  • Karma: 2
  • Offline Offline
  • Posts: 421
[r9311] IP2Country
« on: December 31, 2008, 11:12:42 PM »

I have a problem with the recent TAR:

Code: [Select]
kademlia/routing/Contact.h:84: Warnung: geschweifte Klammern um leeren Körper in einer »else«-Anweisung empfohlen
if g++ -DHAVE_CONFIG_H -I. -I. -I..  -DUSE_WX_EXTENSIONS   -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__  -I./libs -Ilibs -I./include -I/usr/include -D__WEAK_CRYPTO__  -W -Wall -Wshadow -Wundef -O2 -pthread   -MT amule-amule-gui.o -MD -MP -MF ".deps/amule-amule-gui.Tpo" -c -o amule-amule-gui.o `test -f 'amule-gui.cpp' || echo './'`amule-gui.cpp; \
then mv -f ".deps/amule-amule-gui.Tpo" ".deps/amule-amule-gui.Po"; else rm -f ".deps/amule-amule-gui.Tpo"; exit 1; fi
if g++ -DHAVE_CONFIG_H -I. -I. -I..  -DUSE_WX_EXTENSIONS   -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__  -I./libs -Ilibs -I./include -I/usr/include -D__WEAK_CRYPTO__  -W -Wall -Wshadow -Wundef -O2 -pthread   -MT amule-amuleDlg.o -MD -MP -MF ".deps/amule-amuleDlg.Tpo" -c -o amule-amuleDlg.o `test -f 'amuleDlg.cpp' || echo './'`amuleDlg.cpp; \
then mv -f ".deps/amule-amuleDlg.Tpo" ".deps/amule-amuleDlg.Po"; else rm -f ".deps/amule-amuleDlg.Tpo"; exit 1; fi
amuleDlg.cpp:104: Fehler: keine Elementfunktion »void CamuleDlg::IP2CountryDownloadFinished(uint32)« in Klasse »CamuleDlg« deklariert
amuleDlg.cpp:105: Fehler: keine Elementfunktion »void CamuleDlg::EnableIP2Country()« in Klasse »CamuleDlg« deklariert
amuleDlg.cpp: In member function »void CamuleDlg::SetMessagesTool()«:
amuleDlg.cpp:1128: Warnung: Variable »pos« wird nicht verwendet
make[3]: *** [amule-amuleDlg.o] Fehler 1
make[3]: Verlasse Verzeichnis '/home/schutti/Desktop/X/aMule/aMule-SVN-r9311/src'
make[2]: *** [all-recursive] Fehler 1
make[2]: Verlasse Verzeichnis '/home/schutti/Desktop/X/aMule/aMule-SVN-r9311/src'
make[1]: *** [all-recursive] Fehler 1
make[1]: Verlasse Verzeichnis '/home/schutti/Desktop/X/aMule/aMule-SVN-r9311'
make: *** [all] Fehler 2
schutti@hell5:~/Desktop/X/aMule/aMule-SVN-r9311$

the configure says that ip2country/geoip is disabled.
I compile with this flags:

Code: [Select]
./configure --disable-debug --enable-optimize --disable-ccache  --disable-upnp --disable-xas --enable-alc --enable-alcc --disable-xas --enable-amulecmd --enable-webserver --enable-amule-daemon --enable-amule-gui
Translation: Fehler == Error, variable "pos" will not be used...
Logged

Stu Redman

  • Administrator
  • Hero Member
  • *****
  • Karma: 214
  • Offline Offline
  • Posts: 3739
  • Engines screaming
Re: [r9311] IP2Country
« Reply #1 on: January 01, 2009, 02:10:40 PM »

Sorry, my bad.  :-[
Fixed in 9312. (Just remove the #ifdef and the #endif in amuleDlg.h line 185.)
Logged
The image of mother goddess, lying dormant in the eyes of the dead, the sheaf of the corn is broken, end the harvest, throw the dead on the pyre -- Iron Maiden, Isle of Avalon

Schuttwegraeumer

  • Sr. Member
  • ****
  • Karma: 2
  • Offline Offline
  • Posts: 421
Re: [r9311] IP2Country
« Reply #2 on: January 02, 2009, 09:10:36 AM »

Only the ifdef and endif or the complete block:

Code: [Select]

#ifdef ENABLE_IP2COUNTRY
CIP2Country* m_IP2Country;
void IP2CountryDownloadFinished(uint32 result);
void EnableIP2Country();
#endif

EDIT: Removing the complete block don't work.
Logged

Schuttwegraeumer

  • Sr. Member
  • ****
  • Karma: 2
  • Offline Offline
  • Posts: 421
Re: [r9311] IP2Country
« Reply #3 on: January 02, 2009, 10:33:08 AM »

From the r9307:

Code: [Select]
#ifdef ENABLE_IP2COUNTRY
CIP2Country* m_IP2Country;
void IP2CountryDownloadFinished(uint32 result);
#endif

I will test this with the new tar.
Logged

Stu Redman

  • Administrator
  • Hero Member
  • *****
  • Karma: 214
  • Offline Offline
  • Posts: 3739
  • Engines screaming
Re: [r9311] IP2Country
« Reply #4 on: January 02, 2009, 01:38:36 PM »

Just remove the #ifdef and the #endif in amuleDlg.h line 185.
Logged
The image of mother goddess, lying dormant in the eyes of the dead, the sheaf of the corn is broken, end the harvest, throw the dead on the pyre -- Iron Maiden, Isle of Avalon

Schuttwegraeumer

  • Sr. Member
  • ****
  • Karma: 2
  • Offline Offline
  • Posts: 421
Re: [r9311] IP2Country
« Reply #5 on: January 02, 2009, 03:23:53 PM »

Just remove the #ifdef and the #endif in amuleDlg.h line 185.

Line 185 is a empty line.
And there are no #ifdef and #endif in the same line.
Logged

Schuttwegraeumer

  • Sr. Member
  • ****
  • Karma: 2
  • Offline Offline
  • Posts: 421
Re: [r9311] IP2Country
« Reply #6 on: January 02, 2009, 03:36:59 PM »

Just remove the #ifdef and the #endif in amuleDlg.h line 185.

I removed both:

Code: [Select]
BarShader.Po"; else rm -f ".deps/libmuleappgui_a-BarShader.Tpo"; exit 1; fi
if g++ -DHAVE_CONFIG_H -I. -I. -I..  -DUSE_WX_EXTENSIONS -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -I./libs -I./include   -W -Wall -Wshadow -Wundef -O2  -MT libmuleappgui_a-ChatWnd.o -MD -MP -MF ".deps/libmuleappgui_a-ChatWnd.Tpo" -c -o libmuleappgui_a-ChatWnd.o `test -f 'ChatWnd.cpp' || echo './'`ChatWnd.cpp; \
then mv -f ".deps/libmuleappgui_a-ChatWnd.Tpo" ".deps/libmuleappgui_a-ChatWnd.Po"; else rm -f ".deps/libmuleappgui_a-ChatWnd.Tpo"; exit 1; fi
In file included from ChatWnd.cpp:31:
amuleDlg.h:186: Fehler: »ENABLE_IP2COUNTRY« bezeichnet keinen Typ
make[3]: *** [libmuleappgui_a-ChatWnd.o] Fehler 1
make[3]: Verlasse Verzeichnis '/home/schutti/Desktop/X/aMule/aMule-SVN-r9311/src'
make[2]: *** [all-recursive] Fehler 1
make[2]: Verlasse Verzeichnis '/home/schutti/Desktop/X/aMule/aMule-SVN-r9311/src'
make[1]: *** [all-recursive] Fehler 1
make[1]: Verlasse Verzeichnis '/home/schutti/Desktop/X/aMule/aMule-SVN-r9311'
make: *** [all] Fehler 2
schutti@hell5:~/Desktop/X/aMule/aMule-SVN-r9311$
Logged

Stu Redman

  • Administrator
  • Hero Member
  • *****
  • Karma: 214
  • Offline Offline
  • Posts: 3739
  • Engines screaming
Re: [r9311] IP2Country
« Reply #7 on: January 02, 2009, 03:41:20 PM »

With "removing the #ifdef" I meant "removing the whole line with the #ifdef of course. Sorry for not being clear...

Code: [Select]
Index: E:/aMule/dev/SVN/trunk/src/amuleDlg.h
===================================================================
--- E:/aMule/dev/SVN/trunk/src/amuleDlg.h (revision 9311)
+++ E:/aMule/dev/SVN/trunk/src/amuleDlg.h (revision 9312)
@@ -183,11 +183,10 @@
 
  void DoNetworkRearrange();
 
-#ifdef ENABLE_IP2COUNTRY
  CIP2Country* m_IP2Country;
  void IP2CountryDownloadFinished(uint32 result);
  void EnableIP2Country();
-#endif
+
  wxWindow* m_activewnd;
  CTransferWnd* m_transferwnd;
  CServerWnd* m_serverwnd;
Logged
The image of mother goddess, lying dormant in the eyes of the dead, the sheaf of the corn is broken, end the harvest, throw the dead on the pyre -- Iron Maiden, Isle of Avalon