X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups%2Fthread-private.h;h=1b8b1067fe2430415e5fb2002dea8fb4268a7aa6;hb=c674bfbe2b057aeb453276f6088e082264f73d0c;hp=79d2438679939b3352a186384d4fb44ef52cbbd4;hpb=b908d72cace0a011612ba312c7b1a746b74cf80d;p=thirdparty%2Fcups.git

diff --git a/cups/thread-private.h b/cups/thread-private.h
index 79d243867..1b8b1067f 100644
--- a/cups/thread-private.h
+++ b/cups/thread-private.h
@@ -3,13 +3,7 @@
  *
  * Copyright 2009-2017 by Apple Inc.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * missing or damaged, see the license at "http://www.cups.org/".
- *
- * This file is subject to the Apple OS-Developed Software exception.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 #ifndef _CUPS_THREAD_PRIVATE_H_
@@ -20,6 +14,7 @@
  */
 
 #  include "config.h"
+#  include <cups/versioning.h>
 
 
 /*
@@ -46,7 +41,7 @@ typedef pthread_key_t	_cups_threadkey_t;
 #    define _cupsThreadGetData(k) pthread_getspecific(k)
 #    define _cupsThreadSetData(k,p) pthread_setspecific(k,p)
 
-#  elif defined(WIN32)			/* Windows threading */
+#  elif defined(_WIN32)			/* Windows threading */
 #    include <winsock2.h>
 #    include <windows.h>
 typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
@@ -87,20 +82,20 @@ typedef void	*_cups_threadkey_t;
  * Functions...
  */
 
-extern void	_cupsCondBroadcast(_cups_cond_t *cond);
-extern void	_cupsCondInit(_cups_cond_t *cond);
-extern void	_cupsCondWait(_cups_cond_t *cond, _cups_mutex_t *mutex, double timeout);
-extern void	_cupsMutexInit(_cups_mutex_t *mutex);
-extern void	_cupsMutexLock(_cups_mutex_t *mutex);
-extern void	_cupsMutexUnlock(_cups_mutex_t *mutex);
-extern void	_cupsRWInit(_cups_rwlock_t *rwlock);
-extern void	_cupsRWLockRead(_cups_rwlock_t *rwlock);
-extern void	_cupsRWLockWrite(_cups_rwlock_t *rwlock);
-extern void	_cupsRWUnlock(_cups_rwlock_t *rwlock);
-extern void	_cupsThreadCancel(_cups_thread_t thread);
-extern _cups_thread_t _cupsThreadCreate(_cups_thread_func_t func, void *arg);
-extern void     _cupsThreadDetach(_cups_thread_t thread);
-extern void	*_cupsThreadWait(_cups_thread_t thread);
+extern void	_cupsCondBroadcast(_cups_cond_t *cond) _CUPS_PRIVATE;
+extern void	_cupsCondInit(_cups_cond_t *cond) _CUPS_PRIVATE;
+extern void	_cupsCondWait(_cups_cond_t *cond, _cups_mutex_t *mutex, double timeout) _CUPS_PRIVATE;
+extern void	_cupsMutexInit(_cups_mutex_t *mutex) _CUPS_PRIVATE;
+extern void	_cupsMutexLock(_cups_mutex_t *mutex) _CUPS_PRIVATE;
+extern void	_cupsMutexUnlock(_cups_mutex_t *mutex) _CUPS_PRIVATE;
+extern void	_cupsRWInit(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void	_cupsRWLockRead(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void	_cupsRWLockWrite(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void	_cupsRWUnlock(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void	_cupsThreadCancel(_cups_thread_t thread) _CUPS_PRIVATE;
+extern _cups_thread_t _cupsThreadCreate(_cups_thread_func_t func, void *arg) _CUPS_PRIVATE;
+extern void     _cupsThreadDetach(_cups_thread_t thread) _CUPS_PRIVATE;
+extern void	*_cupsThreadWait(_cups_thread_t thread) _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }