Skip to content
Snippets Groups Projects
Commit 3e8e114d authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Fix new Windows build warnings and errors

parent ab8d98a7
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include "datewrap.h" #include "datewrap.h"
#include "text.h" /* TOTAL_TEXT */ #include "text.h" /* TOTAL_TEXT */
#include "ini_file.h" #include "ini_file.h"
#ifdef USE_CRYPTLIB #if defined(SBBS) && defined(USE_CRYPTLIB)
#include "cryptlib.h" #include "ssl.h"
#endif #endif
static void prep_cfg(scfg_t* cfg); static void prep_cfg(scfg_t* cfg);
...@@ -36,7 +36,7 @@ static void free_attr_cfg(scfg_t* cfg); ...@@ -36,7 +36,7 @@ static void free_attr_cfg(scfg_t* cfg);
int lprintf(int level, const char *fmt, ...); /* log output */ int lprintf(int level, const char *fmt, ...); /* log output */
/* readtext.c */ /* readtext.c */
char * readtext(long *line, FILE *stream, long dflt); char * readtext(int *line, FILE *stream, long dflt);
// Returns 0-based text string index // Returns 0-based text string index
int get_text_num(const char* id) int get_text_num(const char* id)
...@@ -348,11 +348,11 @@ void prep_cfg(scfg_t* cfg) ...@@ -348,11 +348,11 @@ void prep_cfg(scfg_t* cfg)
void free_cfg(scfg_t* cfg) void free_cfg(scfg_t* cfg)
{ {
#ifdef USE_CRYPTLIB #if defined(SBBS) && defined(USE_CRYPTLIB)
lock_ssl_cert(); lock_ssl_cert();
if (cfg->tls_certificate != -1 && cfg->prepped) { if (cfg->tls_certificate != -1 && cfg->prepped) {
cryptDestroyContext(cfg->tls_certificate); cryptDestroyContext(cfg->tls_certificate);
cfg->tls_certificate == -1; cfg->tls_certificate = -1;
} }
unlock_ssl_cert(); unlock_ssl_cert();
#endif #endif
......
#ifndef SBBS_SSL_H #ifndef SBBS_SSL_H
#define SBBS_SSL_H #define SBBS_SSL_H
#include "sbbs.h" // For DLLEXPORT #include "dllexport.h"
#include <cryptlib.h> #include <cryptlib.h>
#include "scfgdefs.h" #include "scfgdefs.h"
#include <stdbool.h> #include <stdbool.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment