diff options
author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-02-21 11:29:42 +0100 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-21 12:46:28 +0200 |
commit | e125c8fa82beca36791e1bdeae116824f4bc7a7b (patch) | |
tree | 91d5013cd5e35ed5cf19ca8b94ed0d9e3873dba7 /scp2 | |
parent | 0a7058b48a5ce51f7be99f10fc0363859c41a7aa (diff) |
Put HEADLESS definition under LIBO namespace
tml reminds us that use a generic and potentially clash-prone word
like HEADLESS as preprocessor defintion is pretty lame.
He suggests to put it under the already used LIBO namespace.
To sum it up let's do a s/HEADLESS/LIBO_HEADLESS/g.
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 12 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 301d63d96d1d..789f82643cf5 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -522,7 +522,7 @@ File gid_Brand_File_Bin_Soffice #endif End -#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) +#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5bfe68575cf4..59aa150d2b6a 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -548,7 +548,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) -#ifndef HEADLESS +#ifndef LIBO_HEADLESS #ifndef SYSTEM_CAIRO @@ -934,7 +934,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) && ! defined(QUARTZ) && ! defined(HEADLESS) +#if defined(UNX) && ! defined(QUARTZ) && ! defined(LIBO_HEADLESS) File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); LIB_FILE_BODY; @@ -1160,7 +1160,7 @@ End STD_LIB_FILE( gid_File_Lib_Sot, sot ) -#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) +#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa Name = LIBNAME(spa); @@ -1178,11 +1178,11 @@ File gid_File_Lib_Spell Dir = SCP2_OOO_BIN_DIR; End -#if !defined HEADLESS +#if !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl, spl) #endif -#if defined UNX && !defined MACOSX && !defined HEADLESS +#if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #endif @@ -1703,7 +1703,7 @@ File gid_File_Lib_Libcroco End #endif -#if ! defined HEADLESS +#if ! defined LIBO_HEADLESS #if ! defined SYSTEM_PANGO File gid_File_Lib_Libpango LIB_FILE_BODY; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index c181a0fdb7b1..3fd19c5567d7 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -223,7 +223,7 @@ File gid_File_Bin_Senddoc #endif End -#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) +#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 05353f16b5ff..2f26dd75d7a3 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -76,7 +76,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) +#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) STD_RES_FILE( gid_File_Res_Spa, spa ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 90ec4eaa3714..563652325165 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -689,7 +689,7 @@ Module gid_Module_Root_Files_7 gid_File_Mozilla_Runtime); End -#ifndef HEADLESS +#ifndef LIBO_HEADLESS Module gid_Module_Root_Files_Images PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root; |