Changeset 9df6b0f in mainline

Timestamp:

2014-03-17T19:50:17Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9a5abb78

Parents:

7ddc2c7 (diff), dc5a1f26 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge (minor) libposix changes

• math.h in libposix is more standalone (i.e. no inclusion of libc headers)
• added FILENAME_MAX
• actually allow usage of functions with fpos_t

Location:

uspace/lib/posix

Files:

• Makefile (modified) (3 diffs)
• include/posix/math.h (modified) (2 diffs)
• include/posix/stdio.h (modified) (2 diffs)
• source/stdio.c (modified) (1 diff)

uspace/lib/posix/Makefile

@@ -36 +36 @@
 
 INCLUDE_LIBC = ./include/libc
-INCLUDE_LIBMATH = ./include/libmath
 
 LIBC_FILE = $(LIBC_PREFIX)/libc.a
@@ -47 +46 @@
 COLLISIONS_LIST = collisions.list
 
-PRE_DEPEND = $(INCLUDE_LIBC) $(INCLUDE_LIBMATH)
+PRE_DEPEND = $(INCLUDE_LIBC)
 EXTRA_CLEAN = \
-        $(INCLUDE_LIBC) $(INCLUDE_LIBMATH) \
+        $(INCLUDE_LIBC) \
         $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX) \
         $(COLLISIONS_LIST)
@@ -85 +84 @@
         ln -s -f -n ../$^ $@
 
-$(INCLUDE_LIBMATH): ../math/include
-        ln -s -f -n ../$^ $@
-
 $(FIXED_C_LIBRARY): $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
         $(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBC_FILE) $@

uspace/lib/posix/include/posix/math.h

@@ -31 +31 @@
  */
 /** @file Mathematical operations.
+ *
+ * The purpose of this file is only to provide prototypes of mathematical
+ * functions defined by C standard and by POSIX.
+ *
+ * It is up to the application to correctly link with either libmath
+ * (provided by HelenOS) or by some other math library (such as fdlibm).
  */
 
@@ -36 +42 @@
 #define POSIX_MATH_H_
 
-#include "libmath/math.h"
+#ifdef __GNUC__
+        #define HUGE_VAL (__builtin_huge_val())
+#endif
+
+extern double ldexp(double, int);
+extern double frexp(double, int *);
+
+extern double fabs(double);
+extern double floor(double);
+extern double ceil(double);
+extern double modf(double, double *);
+extern double fmod(double, double);
+extern double pow(double, double);
+extern double exp(double);
+extern double frexp(double, int *);
+extern double expm1(double);
+extern double sqrt(double);
+extern double log(double);
+extern double log10(double);
+extern double sin(double);
+extern double sinh(double);
+extern double asin(double);
+extern double asinh(double);
+extern double cos(double);
+extern double cosh(double);
+extern double acos(double);
+extern double acosh(double);
+extern double tan(double);
+extern double tanh(double);
+extern double atan(double);
+extern double atanh(double);
+extern double atan2(double, double);
+extern double copysign(double, double);
 
 #endif /* POSIX_MATH_H_ */

uspace/lib/posix/include/posix/stdio.h

@@ -64 +64 @@
 #define EOF (-1)
 
+/** Size of buffers used in stdio header. */
 #define BUFSIZ  4096
+
+/** Maximum size in bytes of the longest filename. */
+#define FILENAME_MAX 4096
 
 typedef struct _IO_FILE FILE;
@@ -155 +159 @@
 
 /* File Positioning */
-typedef struct _posix_fpos __POSIX_DEF__(fpos_t);
+typedef struct {
+        off64_t offset;
+} __POSIX_DEF__(fpos_t);
+
 extern int __POSIX_DEF__(fsetpos)(FILE *stream, const __POSIX_DEF__(fpos_t) *pos);
 extern int __POSIX_DEF__(fgetpos)(FILE *restrict stream, __POSIX_DEF__(fpos_t) *restrict pos);

uspace/lib/posix/source/stdio.c

@@ -309 +309 @@
 }
 
-struct _posix_fpos {
-        off64_t offset;
-};
-
 /** Restores stream a to position previously saved with fgetpos().
  *