Changeset 3372 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Jul 3, 2007 1:05:50 AM (18 years ago)

Author:

vboxsync

Message:

XPCOM: Executable and DLL names may be specified from makefiles, for consistency.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src

Files:

• ipcConfig.cpp (modified) (2 diffs)
• ipcConfig.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp

@@ -36 +36 @@
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef XP_WIN
+#if defined(XP_WIN)
+#elif defined(XP_OS2) && defined(XP_OS2_NATIVEIPC)
 #else
 #include <string.h>
@@ -44 +45 @@
 #include "plstr.h"
 
-#ifdef XP_OS2
+#if defined(XP_OS2) && !defined(XP_OS2_NATIVEIPC)
+#ifdef VBOX
+static const char kDefaultSocketPrefix[] = "\\socket\\vbox-";
+#else
 static const char kDefaultSocketPrefix[] = "\\socket\\mozilla-";
+#endif
 static const char kDefaultSocketSuffix[] = "-ipc\\ipcd";
 #else

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.h

@@ -50 +50 @@
 #define IPC_CLIENT_WINDOW_NAME_PREFIX "Mozilla:IPCAppWindow:"
 #define IPC_SYNC_EVENT_NAME           "Local\\MozillaIPCSyncEvent"
+#ifndef IPC_DAEMON_APP_NAME
 #define IPC_DAEMON_APP_NAME           "mozilla-ipcd.exe"
+#endif
 #define IPC_PATH_SEP_CHAR             '\\'
 #define IPC_MODULES_DIR               "ipc\\modules"
@@ -71 +73 @@
 #define IPC_PORT                0
 #define IPC_SOCKET_TYPE         "ipc"
-#define IPC_DAEMON_APP_NAME     "VBoxXPCOMIPCD"
-#ifdef XP_OS2
+#if defined(XP_OS2)
+#ifndef IPC_DAEMON_APP_NAME
+#define IPC_DAEMON_APP_NAME     "mozilla-ipcd.exe"
+#endif
 #define IPC_PATH_SEP_CHAR       '\\'
 #define IPC_MODULES_DIR         "ipc\\modules"
 #else
+#ifndef IPC_DAEMON_APP_NAME
+#define IPC_DAEMON_APP_NAME     "mozilla-ipcd"
+#endif
 #define IPC_PATH_SEP_CHAR       '/'
 #define IPC_MODULES_DIR         "ipc/modules"