From 9af7d3d9e142344ee312a40adbc54814505d8752 Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Mon, 15 Mar 2010 15:27:21 -0300
Subject: [PATCH] obexd: Fix compilation with upstream openobex

Current openobex includes the OBEX_CMD_ACTION symbol, but
doesn't define OBEX_ACTION_{COPY,MOVE,SETPERM}.
---
 obexd/gwobex/obex-priv.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/obexd/gwobex/obex-priv.h b/obexd/gwobex/obex-priv.h
index 01d7b8bd4..f4e3e5be5 100644
--- a/obexd/gwobex/obex-priv.h
+++ b/obexd/gwobex/obex-priv.h
@@ -53,12 +53,12 @@
 # define OBEX_HDR_DESTNAME    0x15
 # define OBEX_HDR_PERMISSIONS 0xD6
 
-# define OBEX_ACTION_COPY     0x00
-# define OBEX_ACTION_MOVE     0x01
-# define OBEX_ACTION_SETPERM  0x02
-
 #endif /* OBEX_CMD_ACTION */
 
+#define OBEX_ACTION_COPY     0x00
+#define OBEX_ACTION_MOVE     0x01
+#define OBEX_ACTION_SETPERM  0x02
+
 #define CONID_INVALID 0xFFFFFFFF
 
 #define OBEX_CMD_NONE 0x10
-- 
2.47.3