make sure users of tonezone.h can deal with new installation location

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1201 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 13 insertions, 9 deletions

diff --git a/tonezone.h b/tonezone.h
index 5cea04e..7ee4dd5 100644
--- a/tonezone.h
+++ b/tonezone.h
@@ -24,7 +24,11 @@
 #ifndef _TONEZONE_H
 #define _TONEZONE_H
 
-#include <zaptel.h>
+#ifdef STANDALONE_ZAPATA
+#include "zaptel.h"
+#else
+#include <zaptel/zaptel.h>
+#endif
 
 struct tone_zone_sound {
 	int toneid;
@@ -47,30 +51,30 @@ struct tone_zone {
 extern struct tone_zone builtin_zones[];
 
 /* Register a given two-letter tone zone if we can */
-extern int tone_zone_register(int fd, char *country);
+int tone_zone_register(int fd, char *country);
 
 /* Register a given two-letter tone zone if we can */
-extern int tone_zone_register_zone(int fd, struct tone_zone *z);
+int tone_zone_register_zone(int fd, struct tone_zone *z);
 
 /* Retrieve a raw tone zone structure */
-extern struct tone_zone *tone_zone_find(char *country);
+struct tone_zone *tone_zone_find(char *country);
 
 /* Retrieve a raw tone zone structure by id instead of country*/
-extern struct tone_zone *tone_zone_find_by_num(int id);
+struct tone_zone *tone_zone_find_by_num(int id);
 
 /* Retrieve a string name for a given tone id */
-extern char *tone_zone_tone_name(int id);
+char *tone_zone_tone_name(int id);
 
 /* Set a given file descriptor into a given country -- USE THIS
    INTERFACE INSTEAD OF THE IOCTL ITSELF.  Auto-loads tone
    zone if necessary */
-extern int tone_zone_set_zone(int fd, char *country);
+int tone_zone_set_zone(int fd, char *country);
 
 /* Get the current tone zone */
-extern int tone_zone_get_zone(int fd);
+int tone_zone_get_zone(int fd);
 
 /* Play a given tone, loading tone zone automatically
    if necessary */
-extern int tone_zone_play_tone(int fd, int toneid);
+int tone_zone_play_tone(int fd, int toneid);
 
 #endif