Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Code Issues Releases Activity

Oh yeah, make sure it compiles without inotify.

Browse Source 
Also removed BSD licensing stuff that pertains to old torsmo code.
This commit is contained in:
Brenden Matthews 2009-05-19 22:56:33 -06:00
parent 75d1a054be
commit a25e030036
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/llua.c
View File

@ -1,10 +1,4 @@
/* Conky, a system monitor, based on torsmo /* Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* All code written since the fork of torsmo is licensed under the GPL
*
* Please see COPYING for details
* *
* Copyright (c) 2009 Toni Spets * Copyright (c) 2009 Toni Spets
* Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
@ -53,8 +47,10 @@ void llua_load(const char *script)
if (error) { if (error) {
ERR("llua_load: %s", lua_tostring(lua_L, -1)); ERR("llua_load: %s", lua_tostring(lua_L, -1));
lua_pop(lua_L, 1); lua_pop(lua_L, 1);
#ifdef HAVE_SYS_INOTIFY_H
} else if (!llua_block_notify) { } else if (!llua_block_notify) {
llua_append_notify(script); llua_append_notify(script);
#endif /* HAVE_SYS_INOTIFY_H */
} }
} }
@ -186,7 +182,9 @@ int llua_getinteger(const char *args, int *per)
void llua_close(void) void llua_close(void)
{ {
#ifdef HAVE_SYS_INOTIFY_H
llua_rm_notifies(); llua_rm_notifies();
#endif /* HAVE_SYS_INOTIFY_H */
if(!lua_L) return; if(!lua_L) return;
lua_close(lua_L); lua_close(lua_L);
lua_L = NULL; lua_L = NULL;

6
src/llua.h
View File

@ -1,10 +1,4 @@
/* Conky, a system monitor, based on torsmo /* Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* All code written since the fork of torsmo is licensed under the GPL
*
* Please see COPYING for details
* *
* Copyright (c) 2009 Toni Spets * Copyright (c) 2009 Toni Spets
* Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.