summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-10-28 04:48:49 -0700
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-28 17:09:40 -0500
commitba53d2b3079aa87284faedb473c9c5a8d91ac7ad (patch)
tree892d701d4bfab60ea30b1a19f5ff83aadfe646b7
parent36fd87c62463e4a6da512229f68b3bb7919cc514 (diff)
Mac OS9 Cleanup #4
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx19
1 files changed, 9 insertions, 10 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index b27ba8b976..dbcd905092 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -73,16 +73,15 @@
#if defined (XP_UNIX)
-#define USER_ENVIRONMENT_VARIABLE "USER"
-#define LOGNAME_ENVIRONMENT_VARIABLE "LOGNAME"
-#define HOME_ENVIRONMENT_VARIABLE "HOME"
-#define PROFILE_NAME_ENVIRONMENT_VARIABLE "PROFILE_NAME"
-#define PROFILE_HOME_ENVIRONMENT_VARIABLE "PROFILE_HOME"
-#define DEFAULT_UNIX_PROFILE_NAME "default"
-#ifndef XP_MACOSX /* Don't use symlink-based locking on OS X */
-#define USE_SYMLINK_LOCKING
-#endif
-#elif defined (XP_BEOS)
+# define USER_ENVIRONMENT_VARIABLE "USER"
+# define LOGNAME_ENVIRONMENT_VARIABLE "LOGNAME"
+# define HOME_ENVIRONMENT_VARIABLE "HOME"
+# define PROFILE_NAME_ENVIRONMENT_VARIABLE "PROFILE_NAME"
+# define PROFILE_HOME_ENVIRONMENT_VARIABLE "PROFILE_HOME"
+# define DEFAULT_UNIX_PROFILE_NAME "default"
+# ifndef XP_MACOSX /* Don't use symlink-based locking on OS X */
+# define USE_SYMLINK_LOCKING
+# endif
#endif
// IID and CIDs of all the services needed