diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-15 19:06:18 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-15 20:24:07 +0800 |
| commit | 6c45f2e325acde97f7b20d704b867bb55a2634c3 (patch) | |
| tree | 3bcd25bc4875a93e4120512879dc782cb0eb41bd /openbsc/include/openbsc/bsc_nat.h | |
| parent | aad68b5ef8ca6c6e9e932fca0a3e7ef68f0e050d (diff) | |
nat: Redo a merge with master that happend at this time.
Diffstat (limited to 'openbsc/include/openbsc/bsc_nat.h')
| -rw-r--r-- | openbsc/include/openbsc/bsc_nat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h index 1da58bcba..9dd5b8f3d 100644 --- a/openbsc/include/openbsc/bsc_nat.h +++ b/openbsc/include/openbsc/bsc_nat.h @@ -25,9 +25,9 @@ #include <sys/types.h> #include <sccp/sccp_types.h> -#include "select.h" -#include "msgb.h" -#include "timer.h" +#include <osmocore/select.h> +#include <osmocore/msgb.h> +#include <osmocore/timer.h> #define DIR_BSC 1 #define DIR_MSC 2 |