osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Gerald Combs 2009-04-08 19:15:10 +00:00
parent ff65240906
commit e2cd2bf4f2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/Makefile.nmake
View File

@ -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.

6
epan/dissectors/packet-kerberos.c
View File

@ -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