diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-04-02 12:24:42 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-04-02 16:06:19 +0100 |
| commit | 5511ac58041c67212653bcace4af587046e98c16 (patch) | |
| tree | f1bba946ae641004e81505d09da778dd2fcac2ce | |
| parent | f569ee7eec7bae19f2552aca82eae2cadef4d848 (diff) | |
Build fixes for xorg ddx
- Update DDXBEFORERESET stub to DDXMAIN stub in xorg DDX
- DDXMAIN prototype in os.h needs to be hidden behind DDXMAIN to ensure sdksyms doesn't
reference it even when being built without DDXMAIN defined (e.g. when just building the
Xorg DDX)
- Reinstate Popen, disabled from building by spawnl patch, as referenced by sdksyms
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 4 | ||||
| -rw-r--r-- | include/os.h | 4 | ||||
| -rw-r--r-- | os/utils.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 7d273aa67..57b3eeabb 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1589,9 +1589,9 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth) return 0; } -#ifdef DDXBEFORERESET +#ifdef DDXMAIN void -ddxBeforeReset(void) +ddxMain(void) { } #endif diff --git a/include/os.h b/include/os.h index 51429a64d..d3a294914 100644 --- a/include/os.h +++ b/include/os.h @@ -84,7 +84,9 @@ typedef struct _NewClientRec *NewClientPtr; #include <stdio.h> #include <stdarg.h> -extern void ddxMain(void); +#ifdef DDXMAIN +extern _X_HIDDEN void ddxMain(void); +#endif #ifdef DDXOSVERRORF extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args); diff --git a/os/utils.c b/os/utils.c index 74b1199ca..09f5ae7fd 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1332,7 +1332,6 @@ static struct pid { OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */ -#if !defined(__CYGWIN__) pointer Popen(const char *command, const char *type) { @@ -1417,7 +1416,6 @@ Popen(const char *command, const char *type) return iop; } -#endif /* fopen that drops privileges */ pointer |