Show
Ignore:
Timestamp:
03/19/08 05:55:31 (16 years ago)
Author:
ppalmers
Message:

apply patch of ticket #82

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/external/dbus/src/dispatcher.cpp

    r562 r962  
    6767int Watch::descriptor() const 
    6868{ 
    69         return dbus_watch_get_fd((DBusWatch*)_int); 
     69        return dbus_watch_get_unix_fd((DBusWatch*)_int); 
    7070} 
    7171 
  • trunk/libffado/external/dbus/tools/xml2cpp.cpp

    r562 r962  
    8484const char* atomic_type_to_string( char t ) 
    8585{ 
    86         static struct { char type; char* name; } atos[] = 
     86        static struct { const char type; const char *name; } atos[] = 
    8787        { 
    8888                { 'y', "::DBus::Byte" },