hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed compilation issues on netbsd i386

Browse Source
This commit is contained in:
hyung-hwan 2017-09-17 12:29:59 +00:00
parent e8b59346a7
commit cdc64c347f
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qse/lib/si/aio-sck.c
View File

@ -333,10 +333,10 @@ static struct sck_type_map_t sck_type_map[] =
#endif #endif
/* QSE_AIO_DEV_SCK_ICMP4 - IP protocol field is 1 byte only. no byte order conversion is needed */ /* QSE_AIO_DEV_SCK_ICMP4 - IP protocol field is 1 byte only. no byte order conversion is needed */
{ AF_INET, SOCK_RAW, IPPROTO_ICMP, 0, 1 }, { AF_INET, SOCK_RAW, IPPROTO_ICMP, 0 },
/* QSE_AIO_DEV_SCK_ICMP6 - IP protocol field is 1 byte only. no byte order conversion is needed */ /* QSE_AIO_DEV_SCK_ICMP6 - IP protocol field is 1 byte only. no byte order conversion is needed */
{ AF_INET6, SOCK_RAW, IPPROTO_ICMP, 0, 1 } { AF_INET6, SOCK_RAW, IPPROTO_ICMP, 0 }
}; };
/* ======================================================================== */ /* ======================================================================== */
@ -847,12 +847,16 @@ static int dev_sck_ioctl (qse_aio_dev_t* dev, int cmd, void* arg)
#if defined(USE_SSL) #if defined(USE_SSL)
if (rdev->ssl_ctx) if (rdev->ssl_ctx)
{ {
#if defined(USE_SSL)
SSL_CTX_free (rdev->ssl_ctx); SSL_CTX_free (rdev->ssl_ctx);
#endif
rdev->ssl_ctx = QSE_NULL; rdev->ssl_ctx = QSE_NULL;
if (rdev->ssl) if (rdev->ssl)
{ {
#if defined(USE_SSL)
SSL_free (rdev->ssl); SSL_free (rdev->ssl);
#endif
rdev->ssl = QSE_NULL; rdev->ssl = QSE_NULL;
} }
} }

21
qse/samples/si/log01.c
View File

@ -8,14 +8,20 @@ void t1 (void)
{ {
qse_log_t* log; qse_log_t* log;
qse_log_target_t t; qse_log_target_t t;
#if defined(QSE_HAVE_INT128_T)
qse_int128_t q = 0x1234567890; qse_int128_t q = 0x1234567890;
#elif defined(QSE_HAVE_INT64_T)
qse_int64_t q = 0x1234567890;
#else
qse_int32_t q = 0x12345678;
#endif
int i; int i;
qse_nwad_t nwad; qse_nwad_t nwad;
t.file = QSE_T("/tmp/t3.log"); t.file = QSE_T("/tmp/t3.log");
/*qse_strtonwad ("127.0.0.1:514", &nwad);*/ /*qse_strtonwad ("127.0.0.1:514", &nwad);*/
/*qse_strtonwad ("@/var/run/log", &nwad);*/ /*qse_strtonwad ("@/var/run/log", &nwad);*/
qse_strtonwad ("@/dev/log", &nwad); qse_strtonwad (QSE_T("@/dev/log"), &nwad);
qse_nwadtoskad (&nwad, &t.syslog_remote); qse_nwadtoskad (&nwad, &t.syslog_remote);
log = qse_log_open (QSE_MMGR_GETDFL(), 0, QSE_T("t3"), log = qse_log_open (QSE_MMGR_GETDFL(), 0, QSE_T("t3"),
@ -34,7 +40,7 @@ void t1 (void)
qse_log_target_t t2; qse_log_target_t t2;
qse_log_gettarget (log, &t2); qse_log_gettarget (log, &t2);
qse_strtonwad ("127.0.0.1:514", &nwad); qse_strtonwad (QSE_T("127.0.0.1:514"), &nwad);
qse_nwadtoskad (&nwad, &t2.syslog_remote); qse_nwadtoskad (&nwad, &t2.syslog_remote);
qse_log_settarget (log, QSE_LOG_CONSOLE | QSE_LOG_FILE | QSE_LOG_SYSLOG_REMOTE, &t2); qse_log_settarget (log, QSE_LOG_CONSOLE | QSE_LOG_FILE | QSE_LOG_SYSLOG_REMOTE, &t2);
@ -44,7 +50,16 @@ void t1 (void)
QSE_ASSERT (qse_log_gettarget (log, QSE_NULL) == (QSE_LOG_CONSOLE | QSE_LOG_FILE | QSE_LOG_SYSLOG_REMOTE)); QSE_ASSERT (qse_log_gettarget (log, QSE_NULL) == (QSE_LOG_CONSOLE | QSE_LOG_FILE | QSE_LOG_SYSLOG_REMOTE));
} }
QSE_LOG4 (log, QSE_T("test"), QSE_LOG_DEBUG, QSE_T("XXXXXXXX %d %I128x %#0128I128b %l20d >>"), 10 * i , q, q, (long)45); QSE_LOG4 (log, QSE_T("test"), QSE_LOG_DEBUG,
#if defined(QSE_HAVE_INT128_T)
QSE_T("MSG %d %I128x %#0128I128b %l20d >>"),
#elif defined(QSE_HAVE_INT64_T)
QSE_T("MSG %d %I64x %#064I64b %l20d >>"),
#else
QSE_T("MSG %d %I32x %#032I32b %l20d >>"),
#endif
10 * i , q, q, (long)45
);
} }