Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

[gnu-emacs] / src / xgselect.h

diff --git a/src/xgselect.h b/src/xgselect.h
index f120d8866cf6a12641a5fec9223c29666f997fd9..21c8acf1016fa10e19d9adfe913074a3a51242ef 100644 (file)
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -1,6 +1,6 @@
 /* Header for xg_select.
-   Copyright (C) 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -28,11 +28,7 @@ extern int xg_select (int max_fds,
                       SELECT_TYPE *rfds,
                       SELECT_TYPE *wfds,
                       SELECT_TYPE *efds,
-                      EMACS_TIME *timeout);
-
-extern void xgselect_initialize (void);
+                     EMACS_TIME const *timeout,
+                     sigset_t const *sigmask);
 
 #endif /* XGSELECT_H */
-
-/* arch-tag: 0c5392a8-3a41-41eb-839c-58e6595926f0
-   (do not change this comment) */