diff options
Diffstat (limited to 'libXmu')
| -rw-r--r-- | libXmu/src/RdBitF.c | 8 | ||||
| -rw-r--r-- | libXmu/src/StrToCurs.c | 1 | ||||
| -rw-r--r-- | libXmu/src/WidgetNode.c | 2 | ||||
| -rw-r--r-- | libXmu/src/config.h | 1 | ||||
| -rw-r--r-- | libXmu/src/libXmu.def | 44 | ||||
| -rw-r--r-- | libXmu/src/makefile | 63 |
6 files changed, 114 insertions, 5 deletions
diff --git a/libXmu/src/RdBitF.c b/libXmu/src/RdBitF.c index 02159c651..58b90a8aa 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 @@ -353,10 +353,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 037eb0cdf..1ab8199ca 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/libXmu.def b/libXmu/src/libXmu.def new file mode 100644 index 000000000..6e369d6c3 --- /dev/null +++ b/libXmu/src/libXmu.def @@ -0,0 +1,44 @@ +LIBRARY libXmu
+EXPORTS
+ _XA_CHARACTER_POSITION
+ _XA_COMPOUND_TEXT
+ _XA_DELETE
+ _XA_LENGTH
+ _XA_LIST_LENGTH
+ _XA_NULL
+ _XA_SPAN
+ _XA_TARGETS
+ _XA_TEXT
+ _XA_UTF8_STRING
+ _XEditResCheckMessages
+ XmuAreaOrXor
+ XmuCompareISOLatin1
+ XmuConvertStandardSelection
+ XmuCreateStippledPixmap
+ XmuCvtBackingStoreToString
+ XmuCvtJustifyToString
+ XmuCvtOrientationToString
+ XmuCvtShapeStyleToString
+ XmuCvtStringToBackingStore
+ XmuCvtStringToBitmap
+ XmuCvtStringToColorCursor
+ XmuCvtStringToCursor
+ XmuCvtStringToJustify
+ XmuCvtStringToOrientation
+ XmuCvtStringToShapeStyle
+ XmuCvtWidgetToString
+ XmuDestroyScanlineList
+ XmuDestroySegmentList
+ XmuGetHostname
+ XmuInternAtom
+ XmuNCopyISOLatin1Lowered
+ XmuNewArea
+ XmuNewCvtStringToWidget
+ XmuNewScanline
+ XmuOptimizeScanline
+ XmuPrintDefaultErrorMessage
+ XmuRegisterExternalAgent
+ XmuReleaseStippledPixmap
+ XmuReshapeWidget
+ XmuScanlineOrSegment
+ XmuScanlineXor
\ No newline at end of file diff --git a/libXmu/src/makefile b/libXmu/src/makefile new file mode 100644 index 000000000..2b94eed65 --- /dev/null +++ b/libXmu/src/makefile @@ -0,0 +1,63 @@ +SHAREDLIB = libXmu + +INCLUDES := ..\include ..\include\X11\Xmu $(INCLUDES) + +DEFINES += XT_NO_SM BITMAPDIR="""bitmaps""" + +INCLUDELIBFILES = \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ + $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ + $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib + +LIBDIRS=$(dir $(INCLUDELIBFILES)) + +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) + + +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 + |