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

WIN32: fix roken build

Browse Source 
__declspec not _declspec

Include "err.h" not <err.h>

Include "roken.h" before "err.h"

Indent "#if" as "# if" within roken.h.in when CPP rules must be copied
into the generated "roken.h".

Correct verr() attribute to be ROKEN_LIB_NORETURN_FUNCTION.

Change-Id: I4289ecaba4a097175b4a5a1cde529b59038c72e3
This commit is contained in:
Jeffrey Altman
2019-01-21 22:04:06 -05:00
parent 18226819cd
commit 3bbd8663b0
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/roken/err.c
View File

@@ -33,9 +33,10 @@
#include <config.h> #include <config.h>
#include "roken.h"
#include "err.h" #include "err.h"
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL ROKEN_LIB_NORETURN_FUNCTION void ROKEN_LIB_CALL
err(int eval, const char *fmt, ...) err(int eval, const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
lib/roken/err.hin
View File

@@ -51,7 +51,7 @@
#endif #endif
#ifndef ROKEN_LIB_NORETURN_FUNCTION #ifndef ROKEN_LIB_NORETURN_FUNCTION
#ifdef _WIN32 #ifdef _WIN32
#define ROKEN_LIB_NORETURN_FUNCTION _declspec(noreturn) #define ROKEN_LIB_NORETURN_FUNCTION __declspec(noreturn)
#else #else
#define ROKEN_LIB_NORETURN_FUNCTION #define ROKEN_LIB_NORETURN_FUNCTION
#endif #endif

10
lib/roken/roken.h.in
View File

@@ -32,11 +32,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#if defined(_WIN32) && _MSC_VER >= 1400 # if defined(_WIN32) && _MSC_VER >= 1400
/* _CRT_RAND_S must be defined before including stdlib.h */ /* _CRT_RAND_S must be defined before including stdlib.h */
# define _CRT_RAND_S # define _CRT_RAND_S
# define HAVE_WIN32_RAND_S 1 # define HAVE_WIN32_RAND_S 1
#endif # endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -69,7 +69,7 @@
# ifdef ROKEN_LIB_DYNAMIC # ifdef ROKEN_LIB_DYNAMIC
# define ROKEN_LIB_NORETURN_FUNCTION __declspec(dllimport noreturn) # define ROKEN_LIB_NORETURN_FUNCTION __declspec(dllimport noreturn)
# else # else
# define ROKEN_LIB_NORETURN_FUNCTION _declspec(noreturn) # define ROKEN_LIB_NORETURN_FUNCTION __declspec(noreturn)
# endif # endif
# else # else
# define ROKEN_LIB_NORETURN_FUNCTION # define ROKEN_LIB_NORETURN_FUNCTION

2
lib/roken/verr.c
View File

@@ -36,7 +36,7 @@
#include "roken.h" #include "roken.h"
#include <err.h> #include <err.h>
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL ROKEN_LIB_NORETURN_FUNCTION void ROKEN_LIB_CALL
verr(int eval, const char *fmt, va_list ap) verr(int eval, const char *fmt, va_list ap)
{ {
rk_warnerr(1, fmt, ap); rk_warnerr(1, fmt, ap);

1
lib/roken/warn.c
View File

@@ -33,6 +33,7 @@
#include <config.h> #include <config.h>
#include "roken.h"
#include "err.h" #include "err.h"
void void