diff --git a/qmake/fougdatax.pro b/qmake/fougdatax.pro index 0163578..892f436 100644 --- a/qmake/fougdatax.pro +++ b/qmake/fougdatax.pro @@ -28,8 +28,8 @@ HEADERS += \ ../src/stream.h \ ../src/task_control.h \ ../src/transfer.h \ - ../src/convert.h \ \ + ../src/internal/convert.h \ ../src/internal/ascii_parse.h SOURCES += \ @@ -37,8 +37,8 @@ SOURCES += \ ../src/error.c \ ../src/stream.c \ ../src/task_control.c \ - ../src/convert.c \ \ + ../src/internal/convert.c \ ../src/internal/ascii_parse.c *-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors diff --git a/src/convert.h b/src/convert.h deleted file mode 100644 index 06511cc..0000000 --- a/src/convert.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef FOUG_CONVERT_H -#define FOUG_CONVERT_H - -#include "global.h" - -FOUG_LIB_EXPORT foug_real32_t foug_convert_real32(uint32_t val); -FOUG_LIB_EXPORT uint32_t foug_convert_uint32(foug_real32_t val); - -#endif /* FOUG_CONVERT_H */ diff --git a/src/endian.c b/src/endian.c index a02535b..8d087fc 100644 --- a/src/endian.c +++ b/src/endian.c @@ -1,6 +1,6 @@ #include "endian.h" -#include "convert.h" +#include "internal/convert.h" #ifdef FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC # include diff --git a/src/convert.c b/src/internal/convert.c similarity index 100% rename from src/convert.c rename to src/internal/convert.c diff --git a/src/internal/convert.h b/src/internal/convert.h new file mode 100644 index 0000000..035916a --- /dev/null +++ b/src/internal/convert.h @@ -0,0 +1,9 @@ +#ifndef FOUG_CONVERT_H +#define FOUG_CONVERT_H + +#include "../global.h" + +foug_real32_t foug_convert_real32(uint32_t val); +uint32_t foug_convert_uint32(foug_real32_t val); + +#endif /* FOUG_CONVERT_H */ diff --git a/src/libstl/stlb_read.c b/src/libstl/stlb_read.c index d0af372..a9936c2 100644 --- a/src/libstl/stlb_read.c +++ b/src/libstl/stlb_read.c @@ -1,8 +1,8 @@ #include "stlb_read.h" -#include "../convert.h" -#include "../error.h" #include "../endian.h" +#include "../error.h" +#include "../internal/convert.h" #include