winDBus authentication stage

Ralf Habacker ralf.habacker at freenet.de
Tue Mar 13 16:44:26 PDT 2007


Havoc Pennington schrieb:
> <snip>
> The things I care about are for example:
>  - put abstractions at the right "level" - fix the root problem
>  - avoid #ifdef hell ; if the project builds on one platform,
How to implement this patch ?  It is a platform independent file and
need platform depending directory settings


Ralf

Index: bus/config-parser.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-parser.c,v
retrieving revision 1.47
diff -u -r1.47 config-parser.c
--- bus/config-parser.c    26 Jan 2007 16:10:09 -0000    1.47
+++ bus/config-parser.c    8 Mar 2007 20:25:40 -0000
@@ -3070,10 +3071,15 @@
 
 static const char *test_service_dir_matches[] =
         {
+#ifdef DBUS_WIN
+         DBUS_DATADIR"/dbus-1/services",
+         NULL,
+#else
          "/testusr/testlocal/testshare/dbus-1/services",
          "/testusr/testshare/dbus-1/services",
          DBUS_DATADIR"/dbus-1/services",
          "/testhome/foo/.testlocal/testshare/dbus-1/services",        
+#endif
          NULL
         };
 


More information about the dbus mailing list