aboutsummaryrefslogtreecommitdiff
path: root/libXmu
diff options
context:
space:
mode:
Diffstat (limited to 'libXmu')
-rw-r--r--libXmu/src/CmapAlloc.c2
-rw-r--r--libXmu/src/RdBitF.c8
-rw-r--r--libXmu/src/StrToCurs.c1
-rw-r--r--libXmu/src/WidgetNode.c2
-rw-r--r--libXmu/src/config.h1
-rw-r--r--libXmu/src/makefile53
6 files changed, 61 insertions, 6 deletions
diff --git a/libXmu/src/CmapAlloc.c b/libXmu/src/CmapAlloc.c
index 78cdb1abc..96ec3cf0b 100644
--- a/libXmu/src/CmapAlloc.c
+++ b/libXmu/src/CmapAlloc.c
@@ -330,7 +330,7 @@ icbrt_with_guess(int a, int guess)
icbrt_loopcount++;
#endif
delta = (guess - a/(guess*guess))/3;
-#ifdef DEBUG
+#ifdef _X_ROOT_STATS
printf("pass %d: guess=%d, delta=%d\n", icbrt_loopcount, guess, delta);
#endif
guess -= delta;
diff --git a/libXmu/src/RdBitF.c b/libXmu/src/RdBitF.c
index 899113ba5..ea447c3c8 100644
--- a/libXmu/src/RdBitF.c
+++ b/libXmu/src/RdBitF.c
@@ -269,7 +269,7 @@ XmuReadBitmapData(FILE *fstream, unsigned int *width, unsigned int *height,
#if defined(WIN32)
static int
-access_file(char *path, char *pathbuf, int len_pathbuf, char **pathret)
+access_file(_Xconst char *path, char *pathbuf, int len_pathbuf, char **pathret)
{
if (access (path, F_OK) == 0) {
if (strlen (path) < len_pathbuf)
@@ -285,7 +285,7 @@ access_file(char *path, char *pathbuf, int len_pathbuf, char **pathret)
}
static int
-AccessFile(char *path, char *pathbuf, int len_pathbuf, char **pathret)
+AccessFile(_Xconst char *path, char *pathbuf, int len_pathbuf, char **pathret)
{
#ifndef MAX_PATH
#define MAX_PATH 512
@@ -359,10 +359,10 @@ AccessFile(char *path, char *pathbuf, int len_pathbuf, char **pathret)
}
FILE *
-fopen_file(char *path, char *mode)
+fopen_file(_Xconst char *path, char *mode)
{
char buf[MAX_PATH];
- char* bufp;
+ char* bufp=buf;
void* ret = NULL;
UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
diff --git a/libXmu/src/StrToCurs.c b/libXmu/src/StrToCurs.c
index 6930e8213..714b004ee 100644
--- a/libXmu/src/StrToCurs.c
+++ b/libXmu/src/StrToCurs.c
@@ -57,6 +57,7 @@ SOFTWARE.
#include <X11/Xmu/Drawing.h>
#include <X11/Xmu/CurUtil.h>
#include <X11/Xmu/CharSet.h>
+#include <unistd.h>
#ifndef X_NOT_POSIX
#include <stdlib.h>
diff --git a/libXmu/src/WidgetNode.c b/libXmu/src/WidgetNode.c
index db295bf15..0cf0bb6c9 100644
--- a/libXmu/src/WidgetNode.c
+++ b/libXmu/src/WidgetNode.c
@@ -53,7 +53,7 @@ static void mark_resource_owner(XmuWidgetNode*);
*/
static char *
binsearch(char *key, char *base, int nelems, int elemsize,
- int compar(_Xconst void*, _Xconst void*))
+ int (*compar)(_Xconst void*, _Xconst void*))
/*
* key - template of object to find
* base - beginning of array
diff --git a/libXmu/src/config.h b/libXmu/src/config.h
new file mode 100644
index 000000000..7206ebebd
--- /dev/null
+++ b/libXmu/src/config.h
@@ -0,0 +1 @@
+#define HAS_SNPRINTF \ No newline at end of file
diff --git a/libXmu/src/makefile b/libXmu/src/makefile
new file mode 100644
index 000000000..be4990997
--- /dev/null
+++ b/libXmu/src/makefile
@@ -0,0 +1,53 @@
+LIBRARY = libXmu
+
+INCLUDES := ..\include ..\include\X11\Xmu $(INCLUDES)
+
+DEFINES += XT_NO_SM BITMAPDIR="""bitmaps"""
+
+CSRCS = \
+ ClientWin.c \
+ CursorName.c \
+ DefErrMsg.c \
+ GetHost.c \
+ Lower.c \
+ AllCmap.c \
+ Atoms.c \
+ Clip.c \
+ CloseHook.c \
+ CmapAlloc.c \
+ CrCmap.c \
+ CrPixFBit.c \
+ CvtCache.c \
+ CvtStdSel.c \
+ DelCmap.c \
+ DisplayQue.c \
+ Distinct.c \
+ DrawLogo.c \
+ DrRndRect.c \
+ EditresCom.c \
+ ExtAgent.c \
+ FToCback.c \
+ GrayPixmap.c \
+ Initer.c \
+ LocBitmap.c \
+ Lookup.c \
+ LookupCmap.c \
+ RdBitF.c \
+ ScrOfWin.c \
+ ShapeWidg.c \
+ StdCmap.c \
+ StrToBS.c \
+ StrToBmap.c \
+ StrToCurs.c \
+ StrToGrav.c \
+ StrToJust.c \
+ StrToLong.c \
+ StrToOrnt.c \
+ StrToShap.c \
+ StrToWidg.c \
+ UpdMapHint.c \
+ VisCmap.c \
+ WidgetNode.c \
+ Xct.c \
+ sharedlib.c
+