Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--intern/opennl/superlu/mmd.c7
-rw-r--r--intern/opennl/superlu/sgstrs.c2
-rw-r--r--intern/opennl/superlu/smyblas2.c7
-rw-r--r--intern/opennl/superlu/strsv.c2
-rw-r--r--intern/opennl/superlu/superlu_timer.c3
-rw-r--r--source/blender/blenlib/intern/freetypefont.c6
-rw-r--r--source/blender/makesdna/intern/makesdna.c5
-rw-r--r--source/blender/src/drawscene.c1
-rw-r--r--source/blender/src/edit.c1
-rw-r--r--source/blender/src/meshtools.c1
-rwxr-xr-xsource/blender/src/transform.c6
-rwxr-xr-xsource/blender/src/transform_constraints.c6
-rw-r--r--source/gameengine/GameLogic/SCA_PythonController.cpp5
13 files changed, 37 insertions, 15 deletions
diff --git a/intern/opennl/superlu/mmd.c b/intern/opennl/superlu/mmd.c
index cc45aea7b41..e103c7de175 100644
--- a/intern/opennl/superlu/mmd.c
+++ b/intern/opennl/superlu/mmd.c
@@ -5,6 +5,13 @@ typedef int shortint;
/* prototypes -------------------- */
int genmmd_(int *, int *, int *, int *, int *, int *, int *,
int *, int *, int *, int *, int *);
+int mmdint_(int *, int *, shortint *, shortint *, shortint *, shortint *, shortint *,
+ shortint *, shortint *);
+int mmdelm_(int *, int *, shortint *, shortint *, shortint *, shortint *, shortint *,
+ shortint *, shortint *, int *, int *);
+int mmdupd_(int *, int *, int *, shortint *, int *, int *, shortint *,
+ shortint *, shortint *, shortint *, shortint *, shortint *, int *, int *);
+int mmdnum_(int *, shortint *, shortint *, shortint *);
/* *************************************************************** */
diff --git a/intern/opennl/superlu/sgstrs.c b/intern/opennl/superlu/sgstrs.c
index 5f7b9b57195..b83545f8ce6 100644
--- a/intern/opennl/superlu/sgstrs.c
+++ b/intern/opennl/superlu/sgstrs.c
@@ -28,7 +28,7 @@
void susolve(int, int, float*, float*);
void slsolve(int, int, float*, float*);
void smatvec(int, int, int, float*, float*, float*);
-
+void sprint_soln(int , float *);
void
sgstrs (trans_t trans, SuperMatrix *L, SuperMatrix *U,
diff --git a/intern/opennl/superlu/smyblas2.c b/intern/opennl/superlu/smyblas2.c
index 729e17f7674..cb2d5cb65af 100644
--- a/intern/opennl/superlu/smyblas2.c
+++ b/intern/opennl/superlu/smyblas2.c
@@ -20,6 +20,13 @@
* triangular matrix is stored in a 2D array M(1:nrow,1:ncol).
* The solution will be returned in the rhs vector.
*/
+
+/* local prototypes*/
+void slsolve ( int, int, float *, float *);
+void susolve ( int, int, float *, float *);
+void smatvec ( int, int, int, float *, float *, float *);
+
+
void slsolve ( int ldm, int ncol, float *M, float *rhs )
{
int k;
diff --git a/intern/opennl/superlu/strsv.c b/intern/opennl/superlu/strsv.c
index 2f6a92c0d0d..415f96f5f74 100644
--- a/intern/opennl/superlu/strsv.c
+++ b/intern/opennl/superlu/strsv.c
@@ -1,3 +1,5 @@
+int strsv_(char *, char *, char *, int *, float *, int *, float *, int *);
+
/* Subroutine */ int strsv_(char *uplo, char *trans, char *diag, int *n,
float *a, int *lda, float *x, int *incx)
diff --git a/intern/opennl/superlu/superlu_timer.c b/intern/opennl/superlu/superlu_timer.c
index 4f68f3a7f1a..f9e130c8c5a 100644
--- a/intern/opennl/superlu/superlu_timer.c
+++ b/intern/opennl/superlu/superlu_timer.c
@@ -36,8 +36,9 @@ double SuperLU_timer_() {
#ifndef CLK_TCK
#define CLK_TCK 60
#endif
+double SuperLU_timer_(void);
-double SuperLU_timer_()
+double SuperLU_timer_(void)
{
#ifdef NO_TIMER
/* no sys/times.h on WIN32 */
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 6e83e63dd5c..5e1300e9cdf 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -89,7 +89,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf)
const char *fontname;
float scale, height;
float dx, dy;
- int i, j, k, l, m;
+ int i, j, k, l, m =0;
// load the freetype font
err = FT_New_Memory_Face( library,
@@ -135,8 +135,8 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf)
// extract generic ascii character range
for(i = myMIN_ASCII; i <= myMAX_ASCII; i++) {
- int *npoints; //total points of each contour
- int *onpoints; //num points on curve
+ int *npoints = NULL; //total points of each contour
+ int *onpoints = NULL; //num points on curve
glyph_index = FT_Get_Char_Index( face, i );
err = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP);
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index fc95c1277d5..52e3f92a40f 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -464,7 +464,7 @@ int preprocess_include(char *maindata, int len)
return newlen;
}
-void *read_file_data(char *filename, int *len_r)
+static void *read_file_data(char *filename, int *len_r)
{
#ifdef WIN32
FILE *fp= fopen(filename, "rb");
@@ -719,7 +719,6 @@ int calculate_structlens(void)
/* 2-4 aligned/ */
if(typelens[type]>3 && (len % 4) ) {
printf("Align 4 error in struct: %s %s (add %d padding bytes)\n", types[structtype], cp, len%4);
- printf(" \n", len%4);
dna_error = 1;
}
else if(typelens[type]==2 && (len % 2) ) {
@@ -1048,7 +1047,7 @@ int make_structDNA(FILE *file)
/* ************************* END MAKE DNA ********************** */
-void make_bad_file(char *file)
+static void make_bad_file(char *file)
{
FILE *fp= fopen(file, "w");
fprintf(fp, "ERROR! Cannot make correct DNA.c file, STUPID!\n");
diff --git a/source/blender/src/drawscene.c b/source/blender/src/drawscene.c
index 24fd03929d7..03ee91eddd6 100644
--- a/source/blender/src/drawscene.c
+++ b/source/blender/src/drawscene.c
@@ -50,6 +50,7 @@
#include "BIF_space.h"
#include "BIF_drawscene.h"
+#include "BIF_poseobject.h"
#include "BSE_view.h"
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index f647ebb66e0..d369888a074 100644
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -73,6 +73,7 @@
#include "BIF_editmesh.h"
#include "BIF_editview.h"
+#include "BIF_editarmature.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "BIF_interface.h"
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index f0f3fe018a6..4a09bc535ff 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -84,6 +84,7 @@ void sort_faces(void);
#include "BIF_screen.h"
#include "BIF_space.h"
#include "BIF_toolbox.h"
+#include "BIF_editconstraint.h"
#include "BDR_editobject.h"
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index c00929c0dda..b7ed1bb6d1f 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -1715,7 +1715,7 @@ void initResize(TransInfo *t)
t->transform = Resize;
}
-void headerResize(TransInfo *t, float vec[3], char *str) {
+static void headerResize(TransInfo *t, float vec[3], char *str) {
char tvec[60];
if (hasNumInput(&t->num)) {
outputNumInput(&(t->num), tvec);
@@ -2161,7 +2161,7 @@ void initTranslation(TransInfo *t)
else initgrabz(t->center[0], t->center[1], t->center[2]);
}
-void headerTranslation(TransInfo *t, float vec[3], char *str) {
+static void headerTranslation(TransInfo *t, float vec[3], char *str) {
char tvec[60];
if (hasNumInput(&t->num)) {
outputNumInput(&(t->num), tvec);
@@ -2189,7 +2189,7 @@ void headerTranslation(TransInfo *t, float vec[3], char *str) {
}
}
-void applyTranslation(TransInfo *t, float vec[3]) {
+static void applyTranslation(TransInfo *t, float vec[3]) {
TransData *td = t->data;
float tvec[3];
int i;
diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c
index 40777ee30a3..4baf700f3dc 100755
--- a/source/blender/src/transform_constraints.c
+++ b/source/blender/src/transform_constraints.c
@@ -372,7 +372,7 @@ static void applyAxisConstraintSize(TransInfo *t, TransData *td, float smat[3][3
*
*/
-void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3][3])
+static void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3][3])
{
if (td && t->con.mode & CON_APPLY) {
float tmat[3][3];
@@ -449,7 +449,7 @@ static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3])
* (ie: not doing counterclockwise rotations when the mouse moves clockwise).
*/
-void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3])
+static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3])
{
if (td && t->con.mode & CON_APPLY) {
int mode = t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
@@ -476,7 +476,7 @@ void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3])
}
}
-void drawObjectConstraint(TransInfo *t) {
+static void drawObjectConstraint(TransInfo *t) {
int i;
TransData * td = t->data;
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 3a7932fa51c..01afd16e963 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -128,7 +128,9 @@ void SCA_PythonController::SetDictionary(PyObject* pythondictionary)
m_pythondictionary = PyDict_Copy(pythondictionary); /* new reference */
}
+#if 0
static char* sPyGetCurrentController__doc__;
+#endif
PyObject* SCA_PythonController::sPyGetCurrentController(PyObject* self,
@@ -139,8 +141,9 @@ PyObject* SCA_PythonController::sPyGetCurrentController(PyObject* self,
return m_sCurrentController;
}
-
+#if 0
static char* sPyAddActiveActuator__doc__;
+#endif
PyObject* SCA_PythonController::sPyAddActiveActuator(
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 21:28:35 +0300