diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-18 21:47:05 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-18 21:47:05 +0000 |
| commit | 7ab98fb0473fd52b3024b7d7ef9d798b21da56b1 (patch) | |
| tree | 01d66cc3703f69f429d92174d83c67dd47144412 | |
| parent | 3b1463d6b34e39d068cdb7e4f4307fbaac44ab47 (diff) | |
Get it actually building when we don't HAVE_LIBPCAP.
It would seem moc doesn't know about or pay attention to #ifdefs so take them
out of wireshark_application.h .
svn path=/trunk/; revision=52681
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_application.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 6e979f3f97..cc8990a377 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -187,7 +187,7 @@ void WiresharkApplication::refreshRecentFiles(void) { } } -void WiresharkApplication::captureCallback(int event, capture_session * cap_session) +void WiresharkApplication::captureCallback(int event _U_, capture_session *cap_session _U_) { #ifdef HAVE_LIBPCAP switch(event) { diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 71c4c5fa81..ac4cac8d3e 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -110,7 +110,6 @@ signals: void packetDissectionChanged(); void preferencesChanged(); -#ifdef HAVE_LIBPCAP // XXX It might make more sense to move these to main.cpp or main_window.cpp or their own class. void captureCapturePrepared(capture_session *cap_session); void captureCaptureUpdateStarted(capture_session *cap_session); @@ -120,7 +119,6 @@ signals: void captureCaptureFixedFinished(capture_session *cap_session); void captureCaptureStopping(capture_session *cap_session); void captureCaptureFailed(capture_session *cap_session); -#endif void captureFileOpened(const capture_file *cf); void captureFileReadStarted(const capture_file *cf); |