hal: Branch 'master'

[Danny Kukawka]

 doc/api/tmpl/.gitignore                         |    3 +++
 hald/linux2/addons/addon-acpi-buttons-toshiba.c |    1 +
 hald/linux2/addons/addon-usb-csr.c              |    1 +
 3 files changed, 5 insertions(+)

New commits:
diff-tree dfad69d4bd0db3a4a619de6bbd98db29e74265a7 (from b412caf1175bf3fcea51ef1b5ed3db1e946bf0d8)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 2 13:52:03 2006 +0200

    fixed compiler warnings and added doc/api/tmpl/.gitignore
    
    Fixed compiler warnings because of missing include of string.h and
    added doc/api/tmpl/.gitignore.

diff --git a/doc/api/tmpl/.gitignore b/doc/api/tmpl/.gitignore
new file mode 100644
index 0000000..6124e19
--- /dev/null
+++ b/doc/api/tmpl/.gitignore
@@ -0,0 +1,3 @@
+hal-unused.sgml
+*.bak
+*~
diff --git a/hald/linux2/addons/addon-acpi-buttons-toshiba.c b/hald/linux2/addons/addon-acpi-buttons-toshiba.c
index 932e11d..8b12165 100644
--- a/hald/linux2/addons/addon-acpi-buttons-toshiba.c
+++ b/hald/linux2/addons/addon-acpi-buttons-toshiba.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <linux/input.h>
 #include <glib/gmain.h>
 
diff --git a/hald/linux2/addons/addon-usb-csr.c b/hald/linux2/addons/addon-usb-csr.c
index 36e4adb..045c482 100644
--- a/hald/linux2/addons/addon-usb-csr.c
+++ b/hald/linux2/addons/addon-usb-csr.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <string.h>
 #include <usb.h>
 
 #include <glib/gmain.h>