diff options
| author | Kenichi Handa | 2012-10-17 22:33:48 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-17 22:33:48 +0900 |
| commit | 596846525bf5f515541ab1ca9a459f4842d55d1d (patch) | |
| tree | e1e4f64ebb40daf0d9ee16b84ef824da30cfbffc /src/dbusbind.c | |
| parent | fe0b1ec40988638025db569a936b09f0295749a1 (diff) | |
| parent | 1f9f395d8063fd633ba73f6cc025ded953bab502 (diff) | |
| download | emacs-596846525bf5f515541ab1ca9a459f4842d55d1d.tar.gz emacs-596846525bf5f515541ab1ca9a459f4842d55d1d.zip | |
merge trunk
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index c2eefd605bb..08f34f47042 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -32,6 +32,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 32 | #define DBUS_NUM_MESSAGE_TYPES 5 | 32 | #define DBUS_NUM_MESSAGE_TYPES 5 |
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | |||
| 36 | /* Some platforms define the symbol "interface", but we want to use it | ||
| 37 | * as a variable name below. */ | ||
| 38 | |||
| 39 | #ifdef interface | ||
| 40 | #undef interface | ||
| 41 | #endif | ||
| 42 | |||
| 35 | 43 | ||
| 36 | /* Subroutines. */ | 44 | /* Subroutines. */ |
| 37 | static Lisp_Object Qdbus_init_bus; | 45 | static Lisp_Object Qdbus_init_bus; |