[PATCH 2/3] Fix pseudoramiX.c compilation without darwin.h

[walter harms]

Am 22.06.2012 15:56, schrieb Jon TURNEY:
> Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
> ---
>  hw/xquartz/pseudoramiX.c |   56 ++++++++++++++++++++++++++++++++--------------
>  1 files changed, 39 insertions(+), 17 deletions(-)
> 
> diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
> index b1b8867..41b80c4 100644
> --- a/hw/xquartz/pseudoramiX.c
> +++ b/hw/xquartz/pseudoramiX.c
> @@ -37,7 +37,6 @@
>  #include <dix-config.h>
>  #endif
>  
> -#include "darwin.h"
>  #include "pseudoramiX.h"
>  #include "extnsionst.h"
>  #include "dixstruct.h"
> @@ -45,6 +44,9 @@
>  #include <X11/extensions/panoramiXproto.h>
>  #include "globals.h"
>  
> +#define TRACE PseudoramiXTrace("TRACE " __FILE__ ":%s",__FUNCTION__)
> +#define DEBUG_LOG PseudoramiXDebug
> +


i would expect something like

#ifdef DEBUG
#define TRACE TRACE PseudoramiXTrace("TRACE " __FILE__ ":%s",__FUNCTION__)
#else
#define TRACE while(0)
#endif

is that hidden somewhere ?

re,
 wh


>  Bool noPseudoramiXExtension = FALSE;
>  
>  extern int
> @@ -95,6 +97,26 @@ static int pseudoramiXScreensAllocated = 0;
>  static int pseudoramiXNumScreens = 0;
>  static unsigned long pseudoramiXGeneration = 0;
>  
> +static void
> +PseudoramiXTrace(const char *format, ...)
> +{
> +    va_list ap;
> +
> +    va_start(ap, format);
> +    LogVMessageVerb(X_NONE, 10, format, ap);
> +    va_end(ap);
> +}
> +
> +static void
> +PseudoramiXDebug(const char *format, ...)
> +{
> +    va_list ap;
> +
> +    va_start(ap, format);
> +    LogVMessageVerb(X_NONE, 3, format, ap);
> +    va_end(ap);
> +}
> +
>  // Add a PseudoramiX screen.
>  // The rest of the X server will know nothing about this screen.
>  // Can be called before or after extension init.
> @@ -132,7 +154,7 @@ PseudoramiXExtensionInit(int argc, char *argv[])
>  
>      if (noPseudoramiXExtension) return;
>  
> -    TRACE();
> +    TRACE;
>  
>      /* Even with only one screen we need to enable PseudoramiX to allow
>         dynamic screen configuration changes. */
> @@ -169,7 +191,7 @@ PseudoramiXExtensionInit(int argc, char *argv[])
>  void
>  PseudoramiXResetScreens(void)
>  {
> -    TRACE();
> +    TRACE;
>  
>      pseudoramiXNumScreens = 0;
>  }
> @@ -177,7 +199,7 @@ PseudoramiXResetScreens(void)
>  static void
>  PseudoramiXResetProc(ExtensionEntry *extEntry)
>  {
> -    TRACE();
> +    TRACE;
>  
>      PseudoramiXResetScreens();
>  }
> @@ -186,7 +208,7 @@ PseudoramiXResetProc(ExtensionEntry *extEntry)
>  static int
>  ProcPseudoramiXQueryVersion(ClientPtr client)
>  {
> -    TRACE();
> +    TRACE;
>  
>      return ProcPanoramiXQueryVersion(client);
>  }
> @@ -200,7 +222,7 @@ ProcPseudoramiXGetState(ClientPtr client)
>      xPanoramiXGetStateReply rep;
>      register int rc;
>  
> -    TRACE();
> +    TRACE;
>  
>      REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
>      rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
> @@ -230,7 +252,7 @@ ProcPseudoramiXGetScreenCount(ClientPtr client)
>      xPanoramiXGetScreenCountReply rep;
>      register int rc;
>  
> -    TRACE();
> +    TRACE;
>  
>      REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
>      rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
> @@ -260,7 +282,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
>      xPanoramiXGetScreenSizeReply rep;
>      register int n, rc;
>  
> -    TRACE();
> +    TRACE;
>      
>      if (stuff->screen >= pseudoramiXNumScreens)
>        return BadMatch;
> @@ -299,7 +321,7 @@ ProcPseudoramiXIsActive(ClientPtr client)
>      /* REQUEST(xXineramaIsActiveReq); */
>      xXineramaIsActiveReply rep;
>  
> -    TRACE();
> +    TRACE;
>  
>      REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
>  
> @@ -368,7 +390,7 @@ static int
>  ProcPseudoramiXDispatch(ClientPtr client)
>  {
>      REQUEST(xReq);
> -    TRACE();
> +    TRACE;
>      switch (stuff->data) {
>      case X_PanoramiXQueryVersion:
>          return ProcPseudoramiXQueryVersion(client);
> @@ -396,7 +418,7 @@ SProcPseudoramiXQueryVersion(ClientPtr client)
>  {
>      REQUEST(xPanoramiXQueryVersionReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      swaps(&stuff->length);
>      REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
> @@ -408,7 +430,7 @@ SProcPseudoramiXGetState(ClientPtr client)
>  {
>      REQUEST(xPanoramiXGetStateReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      swaps(&stuff->length);
>      REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
> @@ -420,7 +442,7 @@ SProcPseudoramiXGetScreenCount(ClientPtr client)
>  {
>      REQUEST(xPanoramiXGetScreenCountReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      swaps(&stuff->length);
>      REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
> @@ -432,7 +454,7 @@ SProcPseudoramiXGetScreenSize(ClientPtr client)
>  {
>      REQUEST(xPanoramiXGetScreenSizeReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      swaps(&stuff->length);
>      REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
> @@ -444,7 +466,7 @@ SProcPseudoramiXIsActive(ClientPtr client)
>  {
>      REQUEST(xXineramaIsActiveReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      swaps(&stuff->length);
>      REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
> @@ -456,7 +478,7 @@ SProcPseudoramiXQueryScreens(ClientPtr client)
>  {
>      REQUEST(xXineramaQueryScreensReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      swaps(&stuff->length);
>      REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
> @@ -468,7 +490,7 @@ SProcPseudoramiXDispatch(ClientPtr client)
>  {
>      REQUEST(xReq);
>  
> -    TRACE();
> +    TRACE;
>  
>      switch (stuff->data) {
>      case X_PanoramiXQueryVersion: