mirror of
https://github.com/irssi/irssi.git
synced 2026-08-19 08:32:07 +02:00
Some fixes for compiling with Win32 :)
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@783 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
c6808b3724
commit
df10f182c0
8 changed files with 50 additions and 12 deletions
|
|
@ -29,7 +29,9 @@
|
|||
#include "queries.h"
|
||||
#include "window-item-def.h"
|
||||
|
||||
#include <sys/utsname.h>
|
||||
#ifdef HAVE_SYS_UTSNAME_H
|
||||
# include <sys/utsname.h>
|
||||
#endif
|
||||
|
||||
#define ALIGN_RIGHT 0x01
|
||||
#define ALIGN_CUT 0x02
|
||||
|
|
@ -673,6 +675,7 @@ static char *expando_dollar(SERVER_REC *server, void *item, int *free_ret)
|
|||
/* system name */
|
||||
static char *expando_sysname(SERVER_REC *server, void *item, int *free_ret)
|
||||
{
|
||||
#ifdef HAVE_SYS_UTSNAME_H
|
||||
struct utsname un;
|
||||
|
||||
if (uname(&un) == -1)
|
||||
|
|
@ -680,12 +683,15 @@ static char *expando_sysname(SERVER_REC *server, void *item, int *free_ret)
|
|||
|
||||
*free_ret = TRUE;
|
||||
return g_strdup(un.sysname);
|
||||
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* system release */
|
||||
static char *expando_sysrelease(SERVER_REC *server, void *item, int *free_ret)
|
||||
{
|
||||
#ifdef HAVE_SYS_UTSNAME_H
|
||||
struct utsname un;
|
||||
|
||||
if (uname(&un) == -1)
|
||||
|
|
@ -693,7 +699,9 @@ static char *expando_sysrelease(SERVER_REC *server, void *item, int *free_ret)
|
|||
|
||||
*free_ret = TRUE;
|
||||
return g_strdup(un.release);
|
||||
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Server tag */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue