Changeset 2259 for trunk

Timestamp:

Jul 17, 2005, 3:43:12 PM (20 years ago)

Author:

bird

Message:

warning cleanup.

Location:

trunk/src/emx/src/lib

Files:

• bsd/db/btree/extern.h (modified) (1 diff, 1 prop)
• bsd/db/hash/hash_log2.c (modified) (1 diff, 1 prop)
• bsd/i386/gen/ldexp.c (modified) (1 diff, 1 prop)
• bsd/include/namespace.h (modified) (1 diff, 1 prop)
• io/get_current_dir_name.c (modified) (1 diff, 1 prop)
• io/getline.c (modified) (1 diff, 1 prop)
• lgpl/include/config.h (modified) (1 diff, 1 prop)
• lgpl/intl/loadmsgcat.c (modified) (1 diff, 1 prop)
• lgpl/misc/error.c (modified) (10 diffs, 1 prop)
• lgpl/posix/regcomp.c (modified) (1 diff, 1 prop)
• misc/getcwd.c (modified) (1 diff, 1 prop)
• msun/src/s_fmaf.c (modified) (1 diff, 1 prop)
• startup/_exit.c (modified) (1 diff, 1 prop)
• str/386/wmemchr.s (modified) (1 diff, 1 prop)
• time/settimeo.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/bsd/db/btree/extern.h

@@ -62 +62 @@
 int      __ovfl_put(BTREE *, const DBT *, pgno_t *);
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(__EMX__)
+void     __bt_dmpage(PAGE *);
 void     __bt_dnpage(DB *, pgno_t);
 void     __bt_dpage(PAGE *);

trunk/src/emx/src/lib/bsd/db/hash/hash_log2.c

@@ -44 +44 @@
 
 #include <db.h>
+#include "hash.h"
+#include "page.h"
+#include "extern.h"
 
 u_int32_t

trunk/src/emx/src/lib/bsd/i386/gen/ldexp.c

@@ -42 +42 @@
 __FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.11 2004/02/16 10:03:02 das Exp $");
 
+/* seems not to be declared anywhere, this shuts up gcc. */
+double _STD(ldexp) (double value, int exp);
+
 /*
  * ldexp(value, exp): return value * (2 ** exp).

trunk/src/emx/src/lib/bsd/include/namespace.h

@@ -35 +35 @@
 #define __sleep      _STD(sleep)
 #define _usleep      _STD(usleep)
+#define feenableexcept __feenableexcept
+#define fedisableexcept __fedisableexcept
 
 #endif

trunk/src/emx/src/lib/io/get_current_dir_name.c

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define _GNU_SOURCE
 #include "libc-alias.h"
 #include <unistd.h>

trunk/src/emx/src/lib/io/getline.c

@@ -28 +28 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define _GNU_SOURCE
 #include "libc-alias.h"
 #include <stdio.h>

trunk/src/emx/src/lib/lgpl/include/config.h

@@ -72 +72 @@
 #define HAVE_MBRTOWC 1
 #define HAVE_WCSCOLL 0
+#define HAVE_DECL_GETC_UNLOCKED 1
 
 #define STRERROR_R_CHAR_P 0

trunk/src/emx/src/lib/lgpl/intl/loadmsgcat.c

@@ -74 +74 @@
 # ifdef IN_INNOTEK_LIBC
 #  define MAP_FAILED    ((void *)-1)
-#  define TEMP_FAILURE_RETRY(expression) \
-  (__extension__                                                              \
-    ({ long int __result;                                                     \
-       do __result = (long int) (expression);                                 \
-       while (__result == -1L && errno == EINTR);                             \
-       __result; }))
 # endif
 #endif

trunk/src/emx/src/lib/lgpl/misc/error.c

@@ -103 +103 @@
 # endif
 
-#ifndef __EMX__                         /* bird */
+#ifndef __EMX__ /* bird */
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
-#else                                   /* bird */
+#else /* __EMX__ */                     /* bird */
 /* Use the BSD _getprogname() which the Innotek LIBC also implements.
    Using this save the time used to maintain the two program_* vars
@@ -124 +124 @@
 # define error __error
 # define error_at_line __error_at_line
-
-#endif                                  /* bird */
-
+#endif /* __EMX__ */                     /* bird */
+
+
+#ifndef __EMX__ /* bird */
 # if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
@@ -151 +152 @@
 #  endif /* HAVE_STRERROR */
 # endif /* HAVE_STRERROR_R || defined strerror_r */
+#endif /* !__EMX__ */ /* bird */
 #endif  /* not _LIBC */
 
@@ -160 +162 @@
 #if defined HAVE_STRERROR_R || _LIBC
   char errbuf[1024];
-# if STRERROR_R_CHAR_P || _LIBC
+# if STRERROR_R_CHAR_P || (defined _LIBC && _LIBC)
   s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else
@@ -172 +174 @@
 #endif
 
-#if !_LIBC
+#if !defined _LIBC || !_LIBC
   if (! s)
     s = _("Unknown system error");
 #endif
 
-#if _LIBC
+#if defined _LIBC && _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     {
@@ -192 +194 @@
 error_tail (int status, int errnum, const char *message, va_list args)
 {
-# if HAVE_VPRINTF || _LIBC
-#  if _LIBC
+# if HAVE_VPRINTF || (defined _LIBC && _LIBC)
+#  if defined _LIBC && _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     {
@@ -244 +246 @@
   if (errnum)
     print_errno_message (errnum);
-# if _LIBC
+# if defined _LIBC && _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     putwc (L'\n', stderr);
@@ -285 +287 @@
   else
     {
-#if _LIBC
+#if defined _LIBC && _LIBC
       if (_IO_fwide (stderr, 0) > 0)
         __fwprintf (stderr, L"%s: ", program_name);
@@ -359 +361 @@
   else
     {
-#if _LIBC
+#if defined _LIBC && _LIBC
       if (_IO_fwide (stderr, 0) > 0)
         __fwprintf (stderr, L"%s: ", program_name);
@@ -369 +371 @@
   if (file_name != NULL)
     {
-#if _LIBC
+#if defined _LIBC && _LIBC
       if (_IO_fwide (stderr, 0) > 0)
         __fwprintf (stderr, L"%s:%d: ", file_name, line_number);

trunk/src/emx/src/lib/lgpl/posix/regcomp.c

@@ -927 +927 @@
                 if (wch != WEOF)
                   dfa->sb_char[i] |= 1 << j;
-# ifndef _LIBC && !defined __INNOTEK_LIBC__
+# if !defined (_LIBC) && !defined (__INNOTEK_LIBC__)
                 if (isascii (ch) && wch != (wchar_t) ch)
                   dfa->map_notascii = 1;

trunk/src/emx/src/lib/misc/getcwd.c

@@ -99 +99 @@
 
     errno = -rc;
-    LIBCLOG_ERROR_RETURN_INT(NULL);
+    LIBCLOG_ERROR_RETURN_P(NULL);
 }
 

trunk/src/emx/src/lib/msun/src/s_fmaf.c

@@ -28 +28 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.1 2005/01/22 09:53:18 das Exp $");
+#include <math.h>
 
 /*

trunk/src/emx/src/lib/startup/_exit.c

@@ -12 +12 @@
     for (;;)
         __exit(ret);
+    LIBCLOG_MSG("shut up\n");
 }

trunk/src/emx/src/lib/str/386/wmemchr.s

@@ -19 +19 @@
         pushl   %edi
         movl    2*4(%esp), %edi         /* wcs */
-        movb    3*4(%esp), %ax          /* wc */
+        movw    3*4(%esp), %ax          /* wc */
         movl    4*4(%esp), %ecx         /* cwc */
         jecxz   Lnull                   /* not found */

trunk/src/emx/src/lib/time/settimeo.c

@@ -12 +12 @@
 int _STD(settimeofday)(const struct timeval *tp, const struct timezone *tzp)
 {
-    LIBCLOG_ENTER("tp=%p:{.tv_sec=%lld, .tv_usec=%ld} tzp=%p:{%s}\n",
-                  (void *)tp, tp ? (long long)tp->tv_sec : -1, tp ? (long)tp->tv_usec : -1, (void *)tzp, tzp);
+    LIBCLOG_ENTER("tp=%p:{.tv_sec=%lld, .tv_usec=%ld} tzp=%p:{.tz_minuteswest=%d, .tz_dsttime=%d}\n",
+                  (void *)tp, tp ? (long long)tp->tv_sec : -1, tp ? (long)tp->tv_usec : -1,
+                  (void *)tzp, tzp ? tzp->tz_minuteswest : -1, tzp ? tzp->tz_dsttime : -1);
     struct timeval local;
     time_t t;