cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c

[stoddard]

stoddard    99/09/22 10:46:05

  Modified:    src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
  Log:
  Make threadproc compile on Win32
  
  Revision  Changes    Path
  1.2       +5 -4      apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- proc.c    1999/08/17 15:59:51     1.1
  +++ proc.c    1999/09/22 17:46:04     1.2
  @@ -338,10 +338,10 @@
           return APR_EEXIST;
   } 
   
  -ap_status_t ap_get_procdata(struct proc_t *proc, void *data)
  +ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
   {
       if (proc != NULL) {
  -        return ap_get_userdata(proc->cntxt, &data);
  +        return ap_get_userdata(proc->cntxt, key, &data);
       }
       else {
           data = NULL;
  @@ -349,10 +349,11 @@
       }
   }
   
  -ap_status_t ap_set_procdata(struct proc_t *proc, void *data)
  +ap_status_t ap_set_procdata(struct proc_t *proc, void *data, char *key,
  +                            ap_status_t (*cleanup) (void *))
   {
       if (proc != NULL) {
  -        return ap_set_userdata(proc->cntxt, data);
  +        return ap_set_userdata(proc->cntxt, data, key, cleanup);
       }
       else {
           data = NULL;
  
  
  
  1.3       +5 -4      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- thread.c  1999/09/14 13:37:36     1.2
  +++ thread.c  1999/09/22 17:46:04     1.3
  @@ -156,10 +156,10 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(struct thread_t *thread, void *data)
  +ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
   {
       if (thread != NULL) {
  -        return ap_get_userdata(thread->cntxt, &data);
  +        return ap_get_userdata(thread->cntxt, key, &data);
       }
       else {
           data = NULL;
  @@ -167,10 +167,11 @@
       }
   }
   
  -ap_status_t ap_set_threaddata(struct thread_t *thread, void *data)
  +ap_status_t ap_set_threaddata(struct thread_t *thread, void *data, char *key,
  +                              ap_status_t (*cleanup) (void *))
   {
       if (thread != NULL) {
  -        return ap_set_userdata(thread->cntxt, data);
  +        return ap_set_userdata(thread->cntxt, data, key, cleanup);
       }
       else {
           data = NULL;
  
  
  
  1.2       +11 -10    apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadpriv.c      1999/08/17 15:59:51     1.1
  +++ threadpriv.c      1999/09/22 17:46:05     1.2
  @@ -70,17 +70,17 @@
   ap_status_t ap_get_thread_private(struct threadkey_t *key, void **new)
   {
       if ((*new) = TlsGetValue(key->key)) {
  -             return APR_SUCCESS;
  -     }
  -     return APR_EEXIST;
  +        return APR_SUCCESS;
  +    }
  +    return APR_EEXIST;
   }
   
   ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
   {
       if (TlsSetValue(key->key, priv)) {
  -             return APR_SUCCESS;
  -     }
  -     return APR_EEXIST;
  +        return APR_SUCCESS;
  +    }
  +    return APR_EEXIST;
   }
   
   ap_status_t ap_delete_thread_private(struct threadkey_t *key)
  @@ -91,10 +91,10 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, void *data)
  +ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, char *key, 
void *data)
   {
       if (threadkey != NULL) {
  -        return ap_get_userdata(threadkey->cntxt, &data);
  +        return ap_get_userdata(threadkey->cntxt, key, &data);
       }
       else {
           data = NULL;
  @@ -102,10 +102,11 @@
       }
   }
   
  -ap_status_t ap_set_threadkeydata(struct threadkey_t *threadkey, void *data)
  +ap_status_t ap_set_threadkeydata(struct threadkey_t *threadkey, void *data,
  +                                 char *key, ap_status_t (*cleanup) (void *))
   {
       if (threadkey != NULL) {
  -        return ap_set_userdata(threadkey->cntxt, data);
  +        return ap_set_userdata(threadkey->cntxt, data, key, cleanup);
       }
       else {
           data = NULL;