tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 08:44:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1033: Provide

Browse Source 
templates for _getshort and _getlong if missing to prevent compiler warnings
   on Linux.
This commit is contained in:
Darren Tucker 2005-05-26 20:12:15 +10:00
parent f08bdb5a7e
commit 84ce9b455d
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -101,6 +101,9 @@
warning: dereferencing type-punned pointer will break strict-aliasing rules warning: dereferencing type-punned pointer will break strict-aliasing rules
warning: passing arg 3 of `pam_get_item' from incompatible pointer type warning: passing arg 3 of `pam_get_item' from incompatible pointer type
The type-punned pointer fix is based on a patch from SuSE's rpm. ok djm@ The type-punned pointer fix is based on a patch from SuSE's rpm. ok djm@
- (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1033: Provide
templates for _getshort and _getlong if missing to prevent compiler warnings
on Linux.
20050524 20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@ -2600,4 +2603,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3788 2005/05/26 09:59:48 dtucker Exp $ $Id: ChangeLog,v 1.3789 2005/05/26 10:12:15 dtucker Exp $

3
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.260 2005/04/24 07:52:23 dtucker Exp $ # $Id: configure.ac,v 1.261 2005/05/26 10:12:15 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -2402,6 +2402,7 @@ int main()
AC_MSG_RESULT(no)]) AC_MSG_RESULT(no)])
]) ])
AC_CHECK_FUNCS(_getshort _getlong) AC_CHECK_FUNCS(_getshort _getlong)
AC_CHECK_DECLS([_getshort, _getlong])
AC_CHECK_MEMBER(HEADER.ad, AC_CHECK_MEMBER(HEADER.ad,
[AC_DEFINE(HAVE_HEADER_AD)],, [AC_DEFINE(HAVE_HEADER_AD)],,
[#include <arpa/nameser.h>]) [#include <arpa/nameser.h>])

4
openbsd-compat/getrrsetbyname.c
View File

@ -144,6 +144,8 @@ _getshort(msgp)
GETSHORT(u, msgp); GETSHORT(u, msgp);
return (u); return (u);
} }
#elif defined(HAVE_DECL__GETSHORT) && (HAVE_DECL__GETSHORT == 0)
u_int16_t _getshort(register const u_char *);
#endif #endif
#ifndef HAVE__GETLONG #ifndef HAVE__GETLONG
@ -156,6 +158,8 @@ _getlong(msgp)
GETLONG(u, msgp); GETLONG(u, msgp);
return (u); return (u);
} }
#elif defined(HAVE_DECL__GETLONG) && (HAVE_DECL__GETLONG == 0)
u_int32_t _getlong(register const u_char *);
#endif #endif
int int