diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-24 06:13:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-24 06:13:22 (GMT) |
| commit | 454614a38dfb1db1931eb58c16e3c8eb4f3c10b8 (patch) | |
| tree | 71277fe16b3a5e2481455069f07078989e43e3fd /unix | |
| parent | ebc1677c589d03c1bd29d1f9d4e974db70b49949 (diff) | |
| download | tk-454614a38dfb1db1931eb58c16e3c8eb4f3c10b8.zip tk-454614a38dfb1db1931eb58c16e3c8eb4f3c10b8.tar.gz tk-454614a38dfb1db1931eb58c16e3c8eb4f3c10b8.tar.bz2 | |
Make it build with --disable-libnotify. Add packages for MacOSX and Ubuntu for Travis build
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixInit.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixInt.h | 7 | ||||
| -rwxr-xr-x | unix/tkUnixSysNotify.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixSysTray.c | 4 |
4 files changed, 16 insertions, 3 deletions
diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c index abb4291..3478f5a 100644 --- a/unix/tkUnixInit.c +++ b/unix/tkUnixInit.c @@ -41,8 +41,8 @@ TkpInit( { TkCreateXEventSource(); GetLibraryPath(interp); - Tktray_Init(interp); - SysNotify_Init (interp); + (void)Tktray_Init(interp); + (void)SysNotify_Init (interp); return TCL_OK; } diff --git a/unix/tkUnixInt.h b/unix/tkUnixInt.h index 0119a85..947ce44 100644 --- a/unix/tkUnixInt.h +++ b/unix/tkUnixInt.h @@ -24,8 +24,13 @@ #include "tkIntPlatDecls.h" +#ifdef HAVE_LIBNOTIFY MODULE_SCOPE int Tktray_Init (Tcl_Interp* interp); -MODULE_SCOPE int SysNotify_Init ( Tcl_Interp* interp ); +MODULE_SCOPE int SysNotify_Init (Tcl_Interp* interp); +#else +#define Tktray_Init(interp) TCL_OK +#define SysNotify_Init(interp) TCL_OK +#endif #endif /* _TKUNIXINT */ diff --git a/unix/tkUnixSysNotify.c b/unix/tkUnixSysNotify.c index 4b93010..e0b2b0f 100755 --- a/unix/tkUnixSysNotify.c +++ b/unix/tkUnixSysNotify.c @@ -12,6 +12,9 @@ #include <tcl.h> #include <tk.h> #include "tkUnixInt.h" + +#ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> /* @@ -117,6 +120,7 @@ int SysNotify_Init ( Tcl_Interp* interp ) return TCL_OK; } +#endif /* HAVE_LIBNOTIFY */ /* * Local Variables: * mode: objc diff --git a/unix/tkUnixSysTray.c b/unix/tkUnixSysTray.c index 604b240..4e5f5ff 100644 --- a/unix/tkUnixSysTray.c +++ b/unix/tkUnixSysTray.c @@ -15,6 +15,8 @@ #include <tk.h> #include "tkUnixInt.h" +#ifdef HAVE_LIBNOTIFY + /* * Based extensively on the tktray extension package. Here we are removing * non-essential parts of tktray. @@ -1694,6 +1696,8 @@ int Tktray_Init ( Tcl_Interp* interp ) return TCL_OK; } +#endif /* HAVE_LIBNOTIFY */ + /* * Local Variables: * mode: objc |