diff --git a/contrib/win32/win32compat/lsa/Ssh-lsa.h b/contrib/win32/win32compat/lsa/Ssh-lsa.h index 9670fe3..e8c4536 100644 --- a/contrib/win32/win32compat/lsa/Ssh-lsa.h +++ b/contrib/win32/win32compat/lsa/Ssh-lsa.h @@ -41,14 +41,16 @@ #include #include #include -#include "Types.h" +#include +#define Unsigned unsigned +#define Char char +#define Int int +#define Long long +#define Not(value) ((value) == 0) #define PKG_NAME "SSH-LSA" - #define PKG_NAME_SIZE sizeof(PKG_NAME) - #define MAX_ACCOUNT_NAME_SIZE (256 * 2) - #define VERSION "4.0.346" typedef struct _SshLsaAuth diff --git a/contrib/win32/win32compat/lsa/Types.h b/contrib/win32/win32compat/lsa/Types.h deleted file mode 100644 index 6cbbecb..0000000 --- a/contrib/win32/win32compat/lsa/Types.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Author: NoMachine - * - * Copyright (c) 2009, 2013 NoMachine - * All rights reserved - * - * Support functions and system calls' replacements needed to let the - * software run on Win32 based operating systems. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef Types_H -#define Types_H - -#include - -#define Unsigned unsigned - -#define Char char -#define Int int -#define Long long - -#ifdef __x86_64__ -#define IntCast(value) ((Int) ((Long Long) (value))) -#define UnsignedIntCast(value) ((Unsigned Int) ((Unsigned Long Long) (value))) -#else -#define IntCast(value) ((Int) (value)) -#define UnsignedIntCast(value) ((Unsigned Int) (value)) -#endif - -#define UnsignedCast(value) UnsignedIntCast((value)) - -#define Not(value) ((value) == 0) - -#define StringSizeCat(destination, source, size) strncat((destination), (source), (size)) -#define StringCompare(first, second) strcmp((first), (second)) -#define StringSizeCopy(destination, source, size) strncpy((destination), (source), (size)) - -#endif /* Types_H */