Sigh, my git grep regexps missed some cases

Change-Id: I085f14f40fb83cba171b35b14cf7c0d99091fc00

16 files changed, 20 insertions, 20 deletions

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 124608eaafc1..60ed9145612e 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -842,7 +842,7 @@ void SbiIoSystem::Shutdown()
     if( !aOut.isEmpty() )
     {
         rtl::OUString aOutStr(rtl::OStringToOUString(aOut, osl_getThreadTextEncoding()));
-#if defined GCC
+#if defined __GNUC__
         Window* pParent = Application::GetDefDialogParent();
         MessBox( pParent, WinBits( WB_OK ), OUString(), aOutStr ).Execute();
 #else
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 122357733cae..f8309a0bf1af 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -555,7 +555,7 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, sal_uInt32 nStart )
     nOps      = 0;
     refExprStk = new SbxArray;
     SetVBAEnabled( pMod->IsVBACompat() );
-#if defined GCC
+#if defined __GNUC__
     SetParameters( pe ? pe->GetParameters() : (class SbxArray *)NULL );
 #else
     SetParameters( pe ? pe->GetParameters() : NULL );
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 6a5ad878f004..bf4efb061fec 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -489,7 +489,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
-#ifdef GCC
+#ifdef __GNUC__
         ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed
 #else
         rBHelper.bDisposed
@@ -540,7 +540,7 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
-#ifdef GCC
+#ifdef __GNUC__
         ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed
 #else
         rBHelper.bDisposed
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 33b9f65f3282..0987eb68e936 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#ifdef GCC
+#ifdef __GNUC__
 #include <iostream>
 #endif
 #include "connectivity/sdbcx/VColumn.hxx"
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 1c41acc3ee8d..586922d72115 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -155,7 +155,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
-#ifdef GCC
+#ifdef __GNUC__
         ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed
 #else
         rBHelper.bDisposed
@@ -372,7 +372,7 @@ void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLExce
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
-#ifdef GCC
+#ifdef __GNUC__
         ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed
 #else
         rBHelper.bDisposed
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index b0704c02bfde..14c2334c87b2 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -174,7 +174,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
-#ifdef GCC
+#ifdef __GNUC__
         ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed
 #else
         rBHelper.bDisposed
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 8229abb6812f..64798ac15107 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -505,7 +505,7 @@ int main( int argc, char **argv)
     return 0;
 }
 
-#ifdef GCC
+#ifdef __GNUC__
 extern "C" {
     void __pure_virtual()
     {}
diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h
index dc0dc145be1d..f3f36f774eb2 100644
--- a/sal/osl/w32/system.h
+++ b/sal/osl/w32/system.h
@@ -48,7 +48,7 @@
 */
 #define WIN32_LEAN_AND_MEAN
 
-#ifdef GCC
+#ifdef __GNUC__
     // windows.h includes winsock2.h
     // if _WIN32_WINNT > 0x0400
     // so someone cannot include winsock.h
@@ -80,7 +80,7 @@
     #pragma warning(pop)
 #endif
 
-#ifdef GCC
+#ifdef __GNUC__
     #   ifndef SA_FAMILY_DECL
     #       define SA_FAMILY_DECL short sa_family
     #   endif
@@ -95,6 +95,6 @@
     #   define NSPROTO_IPX      1000
     #   define NSPROTO_SPX      1256
     #   define NSPROTO_SPXII    1257
-#endif // #ifdef GCC
+#endif // #ifdef __GNUC__
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 765d0be21537..102e564d1f83 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -54,7 +54,7 @@
 #ifdef WNT
 # define snprintf _snprintf
 
-#if defined GCC
+#if defined __GNUC__
 #pragma GCC diagnostic warning "-Wformat"
 #pragma GCC diagnostic warning "-Wformat-extra-args"
 #endif
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index c2316c83b09d..855429e9a48e 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1658,7 +1658,7 @@ throw (uno::RuntimeException)
 #include <stdio.h>
 
 static void dump(sfx2::XmlIdList_t * pList)
-#ifdef GCC
+#ifdef __GNUC__
 __attribute__ ((unused))
 #endif
 ;
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 43c5a3fe8ddf..9b276adeb393 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -27,7 +27,7 @@
 #include <sal/macros.h>
 #include <malloc.h>
 
-#if defined GCC
+#if defined __GNUC__
 #pragma GCC diagnostic warning "-Wmissing-braces"
 #endif
 
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 3f4726513fed..01f38a2e2826 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2795,7 +2795,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
             bool bStop = false;
             while (!bStop)
             {
-#ifdef GCC
+#ifdef __GNUC__
                 // #i21648# GCC over-optimizes something resulting
                 // in wrong fTest values throughout the loops.
                 volatile
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index f161afb4d9f5..e3ff04e832a3 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#ifndef GCC
+#ifndef __GNUC__
 #   pragma hdrstop
 #endif
 
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 2bbff6be1409..941af356b444 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -269,7 +269,7 @@ void SdrTextObj::ImpLinkAnmeldung()
     sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
     if (pLinkManager!=NULL && pData!=NULL && pData->pLink==NULL) { // don't register twice
         pData->pLink=new ImpSdrObjTextLink(this);
-#ifdef GCC
+#ifdef __GNUC__
         pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName,
                                      pData->aFilterName.Len() ?
                                       &pData->aFilterName : (const String *)NULL,
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 66ba746783b0..90e6b3e98cae 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef _PORTXT_HXX
 #define _PORTXT_HXX
-#ifdef GCC
+#ifdef __GNUC__
 #include <sys/types.h>
 #else
 #include <new.h>    // for size_t, FIXEDMEM from tools
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 4bc220918b53..836876b894b0 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -638,7 +638,7 @@ inline sal_Bool SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
 
 inline sal_Bool SwWrtShell::Is_FnDragEQBeginDrag() const
 {
-#ifdef GCC
+#ifdef __GNUC__
     SELECTFUNC  fnTmp = &SwWrtShell::BeginDrag;
     return fnDrag == fnTmp;
 #else