Merge from 1.1.

--HG--
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h

3 files changed, 5 insertions, 5 deletions

diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index e6e30af7e..cfc5cf3a6 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -808,17 +808,17 @@ static int open_fb_device(config_values_t *config, xine_t *xine)
 					XINE_CONFIG_SECURITY, NULL, NULL);
   if(strlen(device_name) > 3)
   {
-    fd = open(device_name, O_RDWR);
+    fd = xine_open_cloexec(device_name, O_RDWR);
   }
   else
   {
     device_name = "/dev/fb1";
-    fd = open(device_name, O_RDWR);
+    fd = xine_open_cloexec(device_name, O_RDWR);
 
     if(fd < 0)
     {
       device_name = "/dev/fb0";
-      fd = open(device_name, O_RDWR);
+      fd = xine_open_cloexec(device_name, O_RDWR);
     }
   }
 
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index d30985e39..7c82f6145 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -292,7 +292,7 @@ static int setup_dga(pgx64_driver_t *this)
     devname = dga_draw_devname(this->dgadraw);
     DGA_DRAW_UNLOCK(this->dgadraw);
 
-    if ((this->devfd = open(devname, O_RDWR)) < 0) {
+    if ((this->devfd = xine_open_cloexec(devname, O_RDWR)) < 0) {
       xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("video_out_pgx64: Error: can't open framebuffer device '%s'\n"), devname);
       XDgaUnGrabDrawable(this->dgadraw);
       XUnlockDisplay(this->display);
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index fa476c492..41406fb58 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -1245,7 +1245,7 @@ static vo_driver_t *vidixfb_open_plugin (video_driver_class_t *class_gen, const
     XINE_CONFIG_SECURITY, NULL, NULL);
 
   /* Open fb device for reading */
-  if((fd = open("/dev/fb0", O_RDONLY)) < 0) {
+  if((fd = xine_open_cloexec("/dev/fb0", O_RDONLY)) < 0) {
     xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "video_out_vidix: unable to open frame buffer device \"%s\": %s\n", device, strerror(errno));
     return NULL;