diff options
| author | edman007 <edman007@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2009-11-18 23:23:25 +0000 |
|---|---|---|
| committer | edman007 <edman007@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2009-11-18 23:23:25 +0000 |
| commit | 42f17dd1458ac28098b614c4da4720e40e2829fd (patch) | |
| tree | 98c60118062ba1e8be853f7f45879c54a7562ba2 | |
| parent | a1101ce4a41b8d11ff88c28735cdc005aba0c203 (diff) | |
| download | lcd4linux-42f17dd1458ac28098b614c4da4720e40e2829fd.tar.gz | |
the DBus plugin is now disabled when dbus is not installed instead of stopping the build
Fix a few warnings in drv_PICGraphic.c
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1064 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to '')
| -rw-r--r-- | drv_PICGraphic.c | 5 | ||||
| -rw-r--r-- | plugins.m4 | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drv_PICGraphic.c b/drv_PICGraphic.c index 3b689d0..4679fb9 100644 --- a/drv_PICGraphic.c +++ b/drv_PICGraphic.c @@ -94,6 +94,7 @@ static char *fbPG = 0, delayDone = 0; void drv_PICGraphic_delay(void *arg) { + (void)arg; delayDone = 1; debug("delay done"); } @@ -224,7 +225,7 @@ static void drv_PICGraphic_blit(const int row, const int col, const int height, drv_PICGraphic_send(fbPG, DROWS * DCOLS / 8); usleep(20000); // wait for reception of confirmation code - status = drv_PICGraphic_recv(cmd, 2, "ff"); + status = drv_PICGraphic_recv((char *) cmd, 2, "ff"); if (!status) { info("received ff from device"); } else { @@ -293,7 +294,7 @@ static int drv_PICGraphic_start2(const char *section) { char *s; char cmd[2]; - int contrast, status, bytes = 0, tick, tack; + int contrast, status, tick, tack; /* read display size from config */ s = cfg_get(section, "Size", NULL); @@ -249,8 +249,8 @@ fi #DBus if test "$PLUGIN_DBUS" = "yes"; then - PKG_CHECK_MODULES(DBUS, dbus-1) - if test "x$DBUS_LIBS" != "x"; then + PKG_CHECK_MODULES(DBUS, dbus-1, dbus-1 >= 1.0, HAVE_DBUS="yes", HAVE_DBUS="no") + if test "x$HAVE_DBUS" != "xyes"; then PLUGINS="$PLUGINS plugin_dbus.o" PLUGINLIBS="$PLUGINLIBS $DBUS_LIBS" CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS" |