diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-04-08 19:15:10 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-04-08 19:15:10 +0000 |
| commit | e2cd2bf4f2e515e8cbc68e4610c1c2786c352042 (patch) | |
| tree | 91a437cc37fc5231e8ab7dbe3c815d81ff9b755f | |
| parent | ff6524090664467444ecffbdbd7045fe61d013ec (diff) | |
Don't assemble asm_utils_win32_x86 on x64. Export a dummy read_keytab_file
if we're not using any encryption libraries on Windows.
This fixes the last Win64 compilation problems in epan.
svn path=/trunk/; revision=28008
| -rw-r--r-- | epan/Makefile.nmake | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 47284c7dbc..7b82c8387b 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -65,7 +65,7 @@ EXTRA_OBJECTS = \ inet_ntop.obj \ mkstemp.obj \ strptime.obj \ -!IFDEF NASM +!IF defined(NASM) && "$(WIRESHARK_TARGET_PLATFORM)" == "win32" asm_utils_win32_x86.obj !ELSE asm_utils.obj @@ -272,7 +272,7 @@ reassemble_test_install: # !IFDEF NASM asm_utils_win32_x86.obj: asm_utils_win32_x86.asm - $(NASM) -f win32 -o $@ $? + $(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $? !ENDIF # (Windows only) Copy some sources from /trunk to /trunk/epan. diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index e8a303a3db..a04b4f3348 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -419,6 +419,12 @@ printf("added key in %u keytype:%d len:%d\n",pinfo->fd->num, keytype, keyleng } #endif /* HAVE_HEIMDAL_KERBEROS || HAVE_MIT_KERBEROS */ +#if defined(_WIN32) && !defined(HAVE_HEIMDAL_KERBEROS) && !defined(HAVE_MIT_KERBEROS) && !defined(HAVE_LIBNETTLE) +void +read_keytab_file(const char *filename _U_) +{ +} +#endif #ifdef HAVE_MIT_KERBEROS |