* Makefile.in: Put -lgcc last in list of libraries, since stdc++ library needs

it.
* cygwin.din: Remove obsolete "__empty" export.
* exceptions.cc (call_signal_handler_now): Force inclusion of function even
when -finline-functions is specified.
* sigproc.h: Remove obsolete call_signal_handler declaration.
* fhandler_console.cc (cp_get_internal): New function.
(cp_convert): New function.
(con_to_str): New function.
(str_to_con): New function.
(fhandler_console::read): Replace OemToCharBuff with con_to_str.
(fhandler_console::write_normal): Replace CharToOemBuff with str_to_con.

1 files changed, 212 insertions, 212 deletions

diff --git a/winsup/cygwin/pthread.cc b/winsup/cygwin/pthread.cc
index 7a92d1d2a..171fe6386 100644
--- a/winsup/cygwin/pthread.cc
+++ b/winsup/cygwin/pthread.cc
@@ -16,237 +16,237 @@
 extern "C"
 {
 /*  ThreadCreation */
-  int
-    pthread_create (pthread_t * thread, const pthread_attr_t * attr,
-		    void *(*start_routine) (void *), void *arg)
-  {
-    return __pthread_create (thread, attr, start_routine, arg);
-  }
-
-  int pthread_attr_init (pthread_attr_t * attr)
-  {
-    return __pthread_attr_init (attr);
-  }
-
-  int pthread_attr_destroy (pthread_attr_t * attr)
-  {
-    return __pthread_attr_destroy (attr);
-  }
-
-  int pthread_attr_setdetachstate (pthread_attr_t * attr, int detachstate)
-  {
-    return __pthread_attr_setdetachstate (attr, detachstate);
-  }
-
-  int
-    pthread_attr_getdetachstate (const pthread_attr_t * attr,
-				 int *detachstate)
-  {
-    return __pthread_attr_getdetachstate (attr, detachstate);
-  }
-
-
-  int pthread_attr_setstacksize (pthread_attr_t * attr, size_t size)
-  {
-    return __pthread_attr_setstacksize (attr, size);
-  }
-
-  int pthread_attr_getstacksize (pthread_attr_t * attr, size_t * size)
-  {
-    return __pthread_attr_getstacksize (attr, size);
-  }
+int
+  pthread_create (pthread_t * thread, const pthread_attr_t * attr,
+		  void *(*start_routine) (void *), void *arg)
+{
+  return __pthread_create (thread, attr, start_routine, arg);
+}
+
+int pthread_attr_init (pthread_attr_t * attr)
+{
+  return __pthread_attr_init (attr);
+}
+
+int pthread_attr_destroy (pthread_attr_t * attr)
+{
+  return __pthread_attr_destroy (attr);
+}
+
+int pthread_attr_setdetachstate (pthread_attr_t * attr, int detachstate)
+{
+  return __pthread_attr_setdetachstate (attr, detachstate);
+}
+
+int
+  pthread_attr_getdetachstate (const pthread_attr_t * attr,
+			       int *detachstate)
+{
+  return __pthread_attr_getdetachstate (attr, detachstate);
+}
+
+
+int pthread_attr_setstacksize (pthread_attr_t * attr, size_t size)
+{
+  return __pthread_attr_setstacksize (attr, size);
+}
+
+int pthread_attr_getstacksize (pthread_attr_t * attr, size_t * size)
+{
+  return __pthread_attr_getstacksize (attr, size);
+}
 
 
 /*
-   pthread_attr_setstackaddr(...){};
-   pthread_attr_getstackaddr(...){};
- */
+ pthread_attr_setstackaddr(...){};
+ pthread_attr_getstackaddr(...){};
+*/
 
 /* Thread Exit */
-  void pthread_exit (void *value_ptr)
-  {
-    return __pthread_exit (value_ptr);
-  }
-
-  int pthread_join (pthread_t thread, void **return_val)
-  {
-    return __pthread_join (&thread, (void **) return_val);
-  }
-
-  int pthread_detach (pthread_t thread)
-  {
-    return __pthread_detach (&thread);
-  }
-
-  int pthread_suspend (pthread_t thread)
-  {
-    return __pthread_suspend (&thread);
-  }
-
-  int pthread_continue (pthread_t thread)
-  {
-    return __pthread_continue (&thread);
-  }
-
-  unsigned long pthread_getsequence_np (pthread_t * thread)
-  {
-    return __pthread_getsequence_np (thread);
-  }
+void pthread_exit (void *value_ptr)
+{
+  return __pthread_exit (value_ptr);
+}
+
+int pthread_join (pthread_t thread, void **return_val)
+{
+  return __pthread_join (&thread, (void **) return_val);
+}
+
+int pthread_detach (pthread_t thread)
+{
+  return __pthread_detach (&thread);
+}
+
+int pthread_suspend (pthread_t thread)
+{
+  return __pthread_suspend (&thread);
+}
+
+int pthread_continue (pthread_t thread)
+{
+  return __pthread_continue (&thread);
+}
+
+unsigned long pthread_getsequence_np (pthread_t * thread)
+{
+  return __pthread_getsequence_np (thread);
+}
 
 /* Thread SpecificData */
-  int pthread_key_create (pthread_key_t * key, void (*destructor) (void *))
-  {
-    return __pthread_key_create (key, destructor);
-  }
-
-  int pthread_key_delete (pthread_key_t * key)
-  {
-    return __pthread_key_delete (key);
-  }
-
-  int pthread_setspecific (pthread_key_t key, const void *value)
-  {
-    return __pthread_setspecific (key, value);
-  }
-
-  void *pthread_getspecific (pthread_key_t key)
-  {
-    return (void *) __pthread_getspecific (key);
-  }
+int pthread_key_create (pthread_key_t * key, void (*destructor) (void *))
+{
+  return __pthread_key_create (key, destructor);
+}
+
+int pthread_key_delete (pthread_key_t * key)
+{
+  return __pthread_key_delete (key);
+}
+
+int pthread_setspecific (pthread_key_t key, const void *value)
+{
+  return __pthread_setspecific (key, value);
+}
+
+void *pthread_getspecific (pthread_key_t key)
+{
+  return (void *) __pthread_getspecific (key);
+}
 
 /* Thread signal */
-  int pthread_kill (pthread_t * thread, int sig)
-  {
-    return __pthread_kill (thread, sig);
-  }
+int pthread_kill (pthread_t * thread, int sig)
+{
+  return __pthread_kill (thread, sig);
+}
 
-  int
-    pthread_sigmask (int operation, const sigset_t * set, sigset_t * old_set)
-  {
-    return __pthread_sigmask (operation, set, old_set);
-  }
+int
+  pthread_sigmask (int operation, const sigset_t * set, sigset_t * old_set)
+{
+  return __pthread_sigmask (operation, set, old_set);
+}
 
 /*  ID */
 
-  pthread_t pthread_self ()
-  {
-    return __pthread_self ();
-  }
+pthread_t pthread_self ()
+{
+  return __pthread_self ();
+}
 
-  int pthread_equal (pthread_t t1, pthread_t t2)
-  {
-    return __pthread_equal (&t1, &t2);
-  }
+int pthread_equal (pthread_t t1, pthread_t t2)
+{
+  return __pthread_equal (&t1, &t2);
+}
 
 /* Mutexes  */
-  int
-    pthread_mutex_init (pthread_mutex_t * mutex,
-			const pthread_mutexattr_t * attr)
-  {
-    return __pthread_mutex_init (mutex, attr);
-  }
-
-  int pthread_mutex_lock (pthread_mutex_t * mutex)
-  {
-    return __pthread_mutex_lock (mutex);
-  }
-
-  int pthread_mutex_trylock (pthread_mutex_t * mutex)
-  {
-    return __pthread_mutex_trylock (mutex);
-  }
-
-  int pthread_mutex_unlock (pthread_mutex_t * mutex)
-  {
-    return __pthread_mutex_unlock (mutex);
-  }
-
-  int pthread_mutex_destroy (pthread_mutex_t * mutex)
-  {
-    return __pthread_mutex_destroy (mutex);
-  }
+int
+  pthread_mutex_init (pthread_mutex_t * mutex,
+		      const pthread_mutexattr_t * attr)
+{
+  return __pthread_mutex_init (mutex, attr);
+}
+
+int pthread_mutex_lock (pthread_mutex_t * mutex)
+{
+  return __pthread_mutex_lock (mutex);
+}
+
+int pthread_mutex_trylock (pthread_mutex_t * mutex)
+{
+  return __pthread_mutex_trylock (mutex);
+}
+
+int pthread_mutex_unlock (pthread_mutex_t * mutex)
+{
+  return __pthread_mutex_unlock (mutex);
+}
+
+int pthread_mutex_destroy (pthread_mutex_t * mutex)
+{
+  return __pthread_mutex_destroy (mutex);
+}
 
 /* Synchronisation */
 
-  int pthread_cond_destroy (pthread_cond_t * cond)
-  {
-    return __pthread_cond_destroy (cond);
-  }
-
-  int
-    pthread_cond_init (pthread_cond_t * cond, const pthread_condattr_t * attr)
-  {
-    return __pthread_cond_init (cond, attr);
-  }
-
-  int pthread_cond_signal (pthread_cond_t * cond)
-  {
-    return __pthread_cond_signal (cond);
-  }
-
-  int pthread_cond_broadcast (pthread_cond_t * cond)
-  {
-    return __pthread_cond_broadcast (cond);
-  }
-
-  int
-    pthread_cond_timedwait (pthread_cond_t * cond,
-			    pthread_mutex_t * mutex,
-			    const struct timespec *abstime)
-  {
-    return __pthread_cond_timedwait (cond, mutex, abstime);
-  }
-
-  int pthread_cond_wait (pthread_cond_t * cond, pthread_mutex_t * mutex)
-  {
-    return __pthread_cond_wait (cond, mutex);
-  }
-
-  int pthread_condattr_init (pthread_condattr_t * condattr)
-  {
-    return __pthread_condattr_init (condattr);
-  }
-
-  int pthread_condattr_destroy (pthread_condattr_t * condattr)
-  {
-    return __pthread_condattr_destroy (condattr);
-  }
-
-  int
-    pthread_condattr_getpshared (const pthread_condattr_t * attr,
-				 int *pshared)
-  {
-    return __pthread_condattr_getpshared (attr, pshared);
-  }
-
-  int pthread_condattr_setpshared (pthread_condattr_t * attr, int pshared)
-  {
-    return __pthread_condattr_setpshared (attr, pshared);
-  }
+int pthread_cond_destroy (pthread_cond_t * cond)
+{
+  return __pthread_cond_destroy (cond);
+}
+
+int
+  pthread_cond_init (pthread_cond_t * cond, const pthread_condattr_t * attr)
+{
+  return __pthread_cond_init (cond, attr);
+}
+
+int pthread_cond_signal (pthread_cond_t * cond)
+{
+  return __pthread_cond_signal (cond);
+}
+
+int pthread_cond_broadcast (pthread_cond_t * cond)
+{
+  return __pthread_cond_broadcast (cond);
+}
+
+int
+  pthread_cond_timedwait (pthread_cond_t * cond,
+			  pthread_mutex_t * mutex,
+			  const struct timespec *abstime)
+{
+  return __pthread_cond_timedwait (cond, mutex, abstime);
+}
+
+int pthread_cond_wait (pthread_cond_t * cond, pthread_mutex_t * mutex)
+{
+  return __pthread_cond_wait (cond, mutex);
+}
+
+int pthread_condattr_init (pthread_condattr_t * condattr)
+{
+  return __pthread_condattr_init (condattr);
+}
+
+int pthread_condattr_destroy (pthread_condattr_t * condattr)
+{
+  return __pthread_condattr_destroy (condattr);
+}
+
+int
+  pthread_condattr_getpshared (const pthread_condattr_t * attr,
+			       int *pshared)
+{
+  return __pthread_condattr_getpshared (attr, pshared);
+}
+
+int pthread_condattr_setpshared (pthread_condattr_t * attr, int pshared)
+{
+  return __pthread_condattr_setpshared (attr, pshared);
+}
 
 /* Semaphores */
-  int sem_init (sem_t * sem, int pshared, unsigned int value)
-  {
-    return __sem_init (sem, pshared, value);
-  }
-
-  int sem_destroy (sem_t * sem)
-  {
-    return __sem_destroy (sem);
-  }
-
-  int sem_wait (sem_t * sem)
-  {
-    return __sem_wait (sem);
-  }
-
-  int sem_trywait (sem_t * sem)
-  {
-    return __sem_trywait (sem);
-  }
-
-  int sem_post (sem_t * sem)
-  {
-    return __sem_post (sem);
-  }
+int sem_init (sem_t * sem, int pshared, unsigned int value)
+{
+  return __sem_init (sem, pshared, value);
+}
+
+int sem_destroy (sem_t * sem)
+{
+  return __sem_destroy (sem);
+}
+
+int sem_wait (sem_t * sem)
+{
+  return __sem_wait (sem);
+}
+
+int sem_trywait (sem_t * sem)
+{
+  return __sem_trywait (sem);
+}
+
+int sem_post (sem_t * sem)
+{
+  return __sem_post (sem);
+}
 }