removed Xquartz debugging code that leaked into master. Our Bad.
This commit is contained in:
parent
a3d40f0549
commit
fa0645b452
14
dix/main.c
14
dix/main.c
|
@ -113,9 +113,6 @@ Equipment Corporation.
|
||||||
#include "dispatch.h" /* InitProcVectors() */
|
#include "dispatch.h" /* InitProcVectors() */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
pthread_key_t threadname_key=0;
|
|
||||||
|
|
||||||
#ifdef DPMSExtension
|
#ifdef DPMSExtension
|
||||||
#define DPMS_SERVER
|
#define DPMS_SERVER
|
||||||
#include <X11/extensions/dpms.h>
|
#include <X11/extensions/dpms.h>
|
||||||
|
@ -251,17 +248,6 @@ main(int argc, char *argv[], char *envp[])
|
||||||
char *xauthfile;
|
char *xauthfile;
|
||||||
HWEventQueueType alwaysCheckForInput[2];
|
HWEventQueueType alwaysCheckForInput[2];
|
||||||
|
|
||||||
if(threadname_key == 0) ErrorF("pthread_key_create returned %d\n", pthread_key_create(&threadname_key, NULL));
|
|
||||||
ErrorF("threadname_key = %d\n", threadname_key);
|
|
||||||
if(pthread_getspecific(threadname_key) == NULL) {
|
|
||||||
char *nameptr = malloc(32);
|
|
||||||
sprintf(nameptr, "main thread %d", random());
|
|
||||||
// strcpy(nameptr, "main thread");
|
|
||||||
ErrorF("calling: pthread_setspecific(%d, %s)=%d\n", threadname_key, nameptr, pthread_setspecific(threadname_key, nameptr));
|
|
||||||
if (pthread_getspecific(threadname_key) != NULL) ErrorF("current thread: %s\n", (char *)pthread_getspecific(threadname_key));
|
|
||||||
} else {
|
|
||||||
if (pthread_getspecific(threadname_key) != NULL) ErrorF("thread was already: %s\n", (char *)pthread_getspecific(threadname_key));
|
|
||||||
}
|
|
||||||
display = "0";
|
display = "0";
|
||||||
|
|
||||||
InitGlobals();
|
InitGlobals();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user