Merge "app_osplookup: Move header defines into the app."

apps/app_osplookup.c

@@ -50,7 +50,6 @@
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cli.h"
-#include "asterisk/astosp.h"
 
 /*** DOCUMENTATION
 	<application name="OSPAuth" language="en_US">
@@ -436,6 +435,11 @@
 	</application>
  ***/
 
+/* OSP Return statuses */
+#define AST_OSP_SUCCESS	((char*)"SUCCESS")	/* Return status, success */
+#define AST_OSP_FAILED	((char*)"FAILED")	/* Return status, failed */
+#define AST_OSP_ERROR	((char*)"ERROR")	/* Return status, error */
+
 /* OSP Buffer Sizes */
 #define OSP_SIZE_INTSTR		((unsigned int)16)			/* OSP signed/unsigned int string buffer size */
 #define OSP_SIZE_NORSTR		((unsigned int)256)			/* OSP normal string buffer size */

include/asterisk/astosp.h

@@ -1,31 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2005, Digium, Inc.
- *
- * Mark Spencer <markster@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- * \brief Open Settlement Protocol (OSP)
- */
-
-#ifndef _ASTERISK_OSP_H
-#define _ASTERISK_OSP_H
-
-#define AST_OSP_SUCCESS	((char*)"SUCCESS")	/* Return status, success */
-#define AST_OSP_FAILED	((char*)"FAILED")	/* Return status, failed */
-#define AST_OSP_ERROR	((char*)"ERROR")	/* Return status, error */
-
-#endif /* _ASTERISK_OSP_H */