Wireshark-commits: [Wireshark-commits] master 2f34ae9: Remove the testing stuff.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 3 Jan 2015 19:03:45 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2f34ae9e98d95ba68f31465241e563a09368cc17
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

2f34ae9 by Guy Harris (guy@xxxxxxxxxxxx):

    Remove the testing stuff.
    
    The problem was probably that we had two competing config.h files, with
    some source files including one of them and othe source files including
    the other, with the nmake config.h defining HAVE_KERBEROS and
    HAVE_MIT_KERBEROS and the CMake config.h defining neither, and with
    wireshark-qt.cpp including the nmake config.h, so that it expected there
    to be a read_keytab_file() routine, and
    epan/dissectors/packet-kerberos.c including the CMake config.h, so that
    it didn't define a read_keytab_file() routine.
    
    (If the CMake build is done out-of-tree, with its config.h file outside
    the source tree, and the nmake build done in-tree, with its config.h in
    the top-level source directory, wireshark-qt.cpp, in the top-level
    source directory, might pick up the config.h in the same directory, but
    epan/dissectors/packet-kerberos.c doesn't have a config.h in its source
    directory and might pick up the config.h from the CMake build
    directory.)
    
    Change-Id: I040126026c4101aca1264affc04e585fee89b87b
    Reviewed-on: https://code.wireshark.org/review/6272
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  e133ba9   tshark: dump port number when generating SCTP endpoints statistics
    adds  2f34ae9   Remove the testing stuff.


Summary of changes:
 wireshark-qt.cpp |   11 -----------
 1 file changed, 11 deletions(-)