Import CUPS v1.7.1

[thirdparty/cups.git] / cups / thread-private.h

diff --git a/cups/thread-private.h b/cups/thread-private.h
index 48f8a39a64517fef18f4dfba42dd2926375ab29b..3409be44ffd0a874b64ddfcd7cc58b3f488a41f8 100644 (file)
--- a/cups/thread-private.h
+++ b/cups/thread-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $"
  *
  *   Private threading definitions for CUPS.
  *
- *   Copyright 2009-2010 by Apple Inc.
+ *   Copyright 2009-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -49,7 +49,7 @@ typedef pthread_key_t _cups_threadkey_t;
 typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
 typedef struct _cups_mutex_s
 {
-  int                  m_init;         /* Flag for on-demand initialization */         
+  int                  m_init;         /* Flag for on-demand initialization */
   CRITICAL_SECTION     m_criticalSection;
                                        /* Win32 Critical Section */
 } _cups_mutex_t;
@@ -62,6 +62,7 @@ typedef DWORD _cups_threadkey_t;
 #    define _cupsThreadSetData(k,p) TlsSetValue(k,p)
 
 #  else
+typedef void   *(*_cups_thread_func_t)(void *arg);
 typedef char   _cups_mutex_t;
 typedef char   _cups_rwlock_t;
 typedef void   *_cups_threadkey_t;
@@ -93,5 +94,5 @@ extern int    _cupsThreadCreate(_cups_thread_func_t func, void *arg);
 #endif /* !_CUPS_THREAD_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $".
  */