include/oox/export/chartexport.hxx | 2 +- include/oox/export/shapes.hxx | 2 +- sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 4dbd58abb495f3e3dd008489f84f8380207127f3 Author: Thomas Arnhold <[email protected]> Date: Mon Sep 1 23:06:54 2014 +0200 Partially revert: fixincludeguards.sh: sd Doesn't look this sane... commit 3b58ababc566adef48d8ab600489e554c4585b1d Author: Thomas Arnhold <[email protected]> Date: Wed Oct 23 22:38:46 2013 +0200 fixincludeguards.sh: sd Change-Id: Ia6836deaa1982febf71cd8abd89e93ea0a844721 diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h old mode 100644 new mode 100755 index ec1f43a..92342be --- a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h @@ -55,14 +55,14 @@ */ -/* INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNS_SD_H contains the mDNSResponder version number for this header file, formatted as follows: +/* _DNS_SD_H contains the mDNSResponder version number for this header file, formatted as follows: * Major part of the build number * 10000 + * minor part of the build number * 100 * For example, Mac OS X 10.4.9 has mDNSResponder-108.4, which would be represented as * version 1080400. This allows C code to do simple greater-than and less-than comparisons: * e.g. an application that requires the DNSServiceGetProperty() call (new in mDNSResponder-126) can check: * - * #if INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNS_SD_H+0 >= 1260000 + * #if _DNS_SD_H+0 >= 1260000 * ... some C code that calls DNSServiceGetProperty() ... * #endif * @@ -76,8 +76,8 @@ * ("system service" on Windows) meets some required minimum functionality level. */ -#ifndef INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNS_SD_H -#define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNS_SD_H 3793700 +#ifndef _DNS_SD_H +#define _DNS_SD_H 3793700 #ifdef __cplusplus extern "C" { @@ -2486,4 +2486,4 @@ struct CompileTimeAssertionChecks_DNS_SD } #endif -#endif // INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNS_SD_H +#endif /* _DNS_SD_H */ commit 368374a67b972f6ff7d4a4441544318efb18edfd Author: Thomas Arnhold <[email protected]> Date: Mon Sep 1 23:03:30 2014 +0200 correct include guard comment Change-Id: Ie94573f7c43c834cd636493bed32f07aa792da49 diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index ed8743c..8f86aa9 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -200,6 +200,6 @@ public: }} -#endif /* ndef INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX */ +#endif // INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index 925ba72..995ef35 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -168,6 +168,6 @@ public: }} -#endif /* ndef INCLUDED_OOX_EXPORT_SHAPES_HXX */ +#endif // INCLUDED_OOX_EXPORT_SHAPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
