oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Remove krb5-types.h.w32

Browse Source 
We are generating krb5-types.h using bits.c.
This commit is contained in:
Asanka Herath
2009-11-26 01:26:41 -05:00
parent faa7dd7234
commit b397a69ca7
2 changed files with 2 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/NTMakefile
View File

@@ -43,10 +43,6 @@ INCFILES= \
$(INCDIR)\krb5-types.h \ $(INCDIR)\krb5-types.h \
$(INCDIR)\version.h $(INCDIR)\version.h
!ifdef USE_STATIC_KRB5_TYPES
$(INCDIR)\krb5-types.h: krb5-types.h.w32
$(CP) $** $@
!else
$(INCDIR)\krb5-types.h: $(OBJ)\bits.exe $(INCDIR)\krb5-types.h: $(OBJ)\bits.exe
$(OBJ)\bits.exe $(INCDIR)\krb5-types.h $(OBJ)\bits.exe $(INCDIR)\krb5-types.h
@@ -54,8 +50,6 @@ $(OBJ)\bits.exe: $(OBJ)\bits.obj
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
!endif
$(INCDIR)\config.h: config.h.w32 ..\windows\NTMakefile.config NTMakefile $(INCDIR)\config.h: config.h.w32 ..\windows\NTMakefile.config NTMakefile
$(PERL) << < config.h.w32 > $@ $(PERL) << < config.h.w32 > $@
@@ -78,7 +72,8 @@ while(<>) {
if ("$(HAVE_PTHREAD_H)") { print "#define HAVE_PTHREAD_H 1\n"; } if ("$(HAVE_PTHREAD_H)") { print "#define HAVE_PTHREAD_H 1\n"; }
if ("$(ENV_HACK)") { print "#define ENV_HACK 1\n"; } if ("$(ENV_HACK)") { print "#define ENV_HACK 1\n"; }
if ("$(HAVE_KCM)") { print "#define HAVE_KCM 1\n"; } if ("$(HAVE_KCM)") { print "#define HAVE_KCM 1\n"; }
if ("$(DIR_hdbdir)") { print "#define HDB_DB_DIR \"$(DIR_hdbdir)\"\n"; } if ("$(HAVE_SCC)") { print "#define HAVE_SCC 1\n"; }
if ("$(DIR_hdbdir)") { print "#define HDB_DB_DIR \"".'$(DIR_hdbdir)'."\"\n"; }
} elsif (m/\@VERSION_OPTDEFS\@/) { } elsif (m/\@VERSION_OPTDEFS\@/) {

61
include/krb5-types.h.w32
View File

@@ -1,61 +0,0 @@
/***********************************************************************
* Copyright (c) 2009, Secure Endpoints Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
* "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
* COPYRIGHT HOLDER OR CONTRIBUTORS 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 __krb5_types_h__
#define __krb5_types_h__
#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
typedef __int8 int8_t;
typedef __int16 int16_t;
typedef __int32 int32_t;
typedef __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
typedef uint64_t u_int64_t;
#endif /* __BIT_TYPES_DEFINED__ */
typedef int krb5_socklen_t;
#ifdef _WIN64
typedef __int64 krb5_ssize_t;
#else
typedef int krb5_ssize_t;
#endif
#endif /* __krb5_types_h__ */